From c0b9c0e09ee45c2b61b6eecae5876bf7d97bed30 Mon Sep 17 00:00:00 2001
From: Your Name
-
-
+
+
- {% if activity.review %}
- {{ activity.review.title }}
- {% endif %}
- {% if activity.mark %}
- {% if activity.mark.rating %}
-
+ {% else %}
+ {{ activity.action_object.created_time|prettydate }}
{% endif %}
+
+
+
+ {{ activity.owner.display_name }} 关注了
+ {{ activity.action_object.target.owner.display_name }}
+ 的收藏单
+
+
+ {% if activity.review %}
+ {{ activity.review.title }}
+ {% endif %}
+ {% if activity.mark %}
+ {% if activity.mark.rating %}
+
+ {% endif %}
- {% if activity.mark.text %}
- {{ activity.mark.text }}
- {{ activity.action_object.created_time|prettydate }}
- {% else %}
- {{ activity.action_object.created_time|prettydate }}
- {% endif %}
-
-
-
- {{ activity.owner.display_name }} {% trans '设置了目标' %}
-
-
- {% if not action.take %}
+ {% if not action.taken %}
➕
{% endif %}
@@ -24,34 +24,35 @@
{% if activity.action_object.metadata.shared_link %}
- {{ activity.action_object.created_time|prettydate }}
- {% else %}
- {{ activity.action_object.created_time|prettydate }}
- {% endif %}
-
-
-
- {{ activity.owner.display_name }} 关注了
- {{ activity.action_object.target.owner.display_name }}
- 的收藏单
-
-
-
{{ activity.mark.text }}
+ {% endif %} + {% endif %} + + diff --git a/social/templates/activity/mark_item.html b/social/templates/activity/mark_item.html index 39f5de9c..87c885ba 100644 --- a/social/templates/activity/mark_item.html +++ b/social/templates/activity/mark_item.html @@ -15,7 +15,7 @@- {% if activity.action_object.review %} - {{ activity.review.title }} - {% endif %} - {% if activity.action_object.mark.rating %} - - {% endif %} - {% if activity.action_object.mark.text %} -
{{ activity.action_object.mark.text }}
- {% endif %} - - \ No newline at end of file + + + {{ activity.owner.display_name }} {{ activity.action_object.mark.action_label }} + ++ {% if activity.action_object.review %} + {{ activity.review.title }} + {% endif %} + {% if activity.action_object.mark.rating %} + + {% endif %} + {% if activity.action_object.mark.text %} +
{{ activity.action_object.mark.text }}
+ {% endif %} + + diff --git a/social/templates/activity/review_item.html b/social/templates/activity/review_item.html index 1a515e86..25ab0a23 100644 --- a/social/templates/activity/review_item.html +++ b/social/templates/activity/review_item.html @@ -25,30 +25,31 @@ {% if activity.action_object.metadata.shared_link %}- {% if activity.action_object.review %} - {{ activity.review.title }} - {% endif %} - {% if activity.action_object.rating_grade %} - - {% endif %} -
- -
+ + + {{ activity.owner.display_name }} {% trans '评论了' %} + {{ activity.action_object.item.title }} + {% if activity.action_object.item.year %}({{ activity.action_object.item.year }}){% endif %} + + + ++ {% if activity.action_object.review %} + {{ activity.review.title }} + {% endif %} + {% if activity.action_object.rating_grade %} + + {% endif %} +
+
- \ No newline at end of file + +