diff --git a/common/static/scss/_feed.scss b/common/static/scss/_feed.scss index 67ca5706..d21a6362 100644 --- a/common/static/scss/_feed.scss +++ b/common/static/scss/_feed.scss @@ -12,7 +12,7 @@ } } - section { + > section { margin-bottom: var(--pico-spacing); display: grid; grid-template-columns: auto 1fr; diff --git a/social/templates/activity/comment_child_item.html b/social/templates/activity/comment_child_item.html index c048b3d2..ac86729f 100644 --- a/social/templates/activity/comment_child_item.html +++ b/social/templates/activity/comment_child_item.html @@ -12,16 +12,6 @@ {% wish_item_action activity.action_object.item.parent_item as action %} {% like_piece_action activity.action_object as like_action %} - - {% liked_piece activity.action_object as liked %} - {% include 'like_stats.html' with liked=liked piece=activity.action_object %} - - - - {% if activity.action_object.item.class_name == 'podcastepisode' %} {% endif %} + - + + {% if activity.action_object.latest_post %} + {% include "action_reply_piece.html" with post=activity.action_object.latest_post piece=activity.action_object %} + {% include "action_like_post.html" with post=activity.action_object.latest_post %} + {% include "action_boost_post.html" with post=activity.action_object.latest_post %} + {% include "action_open_post.html" with post=activity.action_object.latest_post %} + {% endif %}
{{ activity.action_object.mark.action_label }} @@ -68,9 +63,8 @@
{% include "_item_card.html" with item=activity.action_object.item.parent_item allow_embed=1 %} - {% if activity.action_object.mark.comment_text %} - - {% endif %} +
diff --git a/social/templates/activity/create_collection.html b/social/templates/activity/create_collection.html index 6c7ca302..be572418 100644 --- a/social/templates/activity/create_collection.html +++ b/social/templates/activity/create_collection.html @@ -9,10 +9,12 @@ {% load prettydate %} {% load user_actions %} - - {% liked_piece activity.action_object as liked %} - {% include 'like_stats.html' with liked=liked piece=activity.action_object label='关注' icon='fa-heart' %} - + {% if activity.action_object.latest_post %} + {% include "action_reply_piece.html" with post=activity.action_object.latest_post piece=activity.action_object %} + {% include "action_like_post.html" with post=activity.action_object.latest_post %} + {% include "action_boost_post.html" with post=activity.action_object.latest_post %} + {% include "action_open_post.html" with post=activity.action_object.latest_post %} + {% endif %}
创建了收藏单 diff --git a/social/templates/activity/feature_collection.html b/social/templates/activity/feature_collection.html index 1b3628e6..8b24d1c9 100644 --- a/social/templates/activity/feature_collection.html +++ b/social/templates/activity/feature_collection.html @@ -10,10 +10,12 @@ {% load user_actions %} {% with activity.action_object.target as collection %} - - {% liked_piece collection as liked %} - {% include 'like_stats.html' with liked=liked piece=collection label='关注' icon='fa-heart' %} - + {% if activity.action_object.latest_post %} + {% include "action_reply_piece.html" with post=activity.action_object.latest_post piece=activity.action_object %} + {% include "action_like_post.html" with post=activity.action_object.latest_post %} + {% include "action_boost_post.html" with post=activity.action_object.latest_post %} + {% include "action_open_post.html" with post=activity.action_object.latest_post %} + {% endif %}
设置了目标 diff --git a/social/templates/activity/like_collection.html b/social/templates/activity/like_collection.html index 7f73c907..3c6fed06 100644 --- a/social/templates/activity/like_collection.html +++ b/social/templates/activity/like_collection.html @@ -10,10 +10,12 @@ {% load user_actions %} {% with activity.action_object.target as collection %} - - {% liked_piece collection as liked %} - {% include 'like_stats.html' with liked=liked piece=collection label='关注' icon='fa-heart' %} - + {% if activity.action_object.latest_post %} + {% include "action_reply_piece.html" with post=activity.action_object.latest_post piece=activity.action_object %} + {% include "action_like_post.html" with post=activity.action_object.latest_post %} + {% include "action_boost_post.html" with post=activity.action_object.latest_post %} + {% include "action_open_post.html" with post=activity.action_object.latest_post %} + {% endif %}
关注了 diff --git a/social/templates/activity/mark_item.html b/social/templates/activity/mark_item.html index c9c5abc3..fa5649a9 100644 --- a/social/templates/activity/mark_item.html +++ b/social/templates/activity/mark_item.html @@ -11,15 +11,6 @@ {% load duration %} {% wish_item_action activity.action_object.item as action %} - - {% liked_piece activity.action_object as liked %} - {% include 'like_stats.html' with liked=liked piece=activity.action_object %} - - {% comment %} - - - - {% endcomment %} {% if not action.taken %} {% endif %} - - - + {% if activity.action_object.latest_post %} + {% include "action_reply_piece.html" with post=activity.action_object.latest_post piece=activity.action_object %} + {% include "action_like_post.html" with post=activity.action_object.latest_post %} + {% include "action_boost_post.html" with post=activity.action_object.latest_post %} + {% include "action_open_post.html" with post=activity.action_object.latest_post %} + {% endif %}
{{ activity.action_object.mark.action_label }} @@ -50,9 +44,8 @@
{% include "_item_card.html" with item=activity.action_object.item allow_embed=1 %} - {% if activity.action_object.mark.comment_text %} -
-

{{ activity.action_object.mark.comment_html|safe }}

-
- {% endif %} +
+ {% if activity.action_object.mark.comment_text %}

{{ activity.action_object.mark.comment_html|safe }}

{% endif %} +

+
diff --git a/social/templates/activity/review_item.html b/social/templates/activity/review_item.html index 3092cd71..6d21cc90 100644 --- a/social/templates/activity/review_item.html +++ b/social/templates/activity/review_item.html @@ -11,10 +11,6 @@ {% load duration %} {% wish_item_action activity.action_object.item as action %} - - {% liked_piece activity.action_object as liked %} - {% include 'like_stats.html' with liked=liked piece=activity.action_object %} - {% if not action.taken %} {% endif %} - - - + {% if activity.action_object.latest_post %} + {% include "action_reply_piece.html" with post=activity.action_object.latest_post piece=activity.action_object %} + {% include "action_like_post.html" with post=activity.action_object.latest_post %} + {% include "action_boost_post.html" with post=activity.action_object.latest_post %} + {% include "action_open_post.html" with post=activity.action_object.latest_post %} + {% endif %}
写了评论 @@ -47,5 +46,6 @@ {% include "_item_card.html" with item=activity.action_object.item allow_embed=1 %}