+
+ {% include "_sidebar.html" with show_progress=1 identity=request.user.identity %}
+ {% trans 'Notification' %}
+
+
+
+
+
+ diff --git a/common/static/scss/_feed.scss b/common/static/scss/_feed.scss index d21a6362..f2b85aee 100644 --- a/common/static/scss/_feed.scss +++ b/common/static/scss/_feed.scss @@ -66,6 +66,12 @@ // margin-right: 4px; } + blockquote { + padding-top: 0; + padding-bottom: 0; + margin: 0; + } + .spacing { margin-bottom: calc(var(--pico-block-spacing-horizontal)/2); } diff --git a/common/templates/_header.html b/common/templates/_header.html index 52617e04..7aa1e4ce 100644 --- a/common/templates/_header.html +++ b/common/templates/_header.html @@ -78,6 +78,9 @@
+ {{ event.post.content|bleach:"a,p,span,br,div,img"|default:"diff --git a/social/templates/event/boosted_collection.html b/social/templates/event/boosted_collection.html new file mode 100644 index 00000000..52d7f300 --- /dev/null +++ b/social/templates/event/boosted_collection.html @@ -0,0 +1 @@ +boosted your collection {{ event.piece.title }} diff --git a/social/templates/event/boosted_comment.html b/social/templates/event/boosted_comment.html new file mode 100644 index 00000000..bd25df1a --- /dev/null +++ b/social/templates/event/boosted_comment.html @@ -0,0 +1,8 @@ +{% load duration %} +boost your comment on {{ event.item.display_title }} +
" }} +
+ + {% if event.piece.rating_grade %}{{ event.piece.rating_grade|rating_star }}{% endif %} + + {{ event.piece.html|safe }} +diff --git a/social/templates/event/boosted_review.html b/social/templates/event/boosted_review.html new file mode 100644 index 00000000..95cbf5e2 --- /dev/null +++ b/social/templates/event/boosted_review.html @@ -0,0 +1 @@ +boosted your review {{ event.piece.title }} on {{ event.item.display_title }} diff --git a/social/templates/event/boosted_shelfmember.html b/social/templates/event/boosted_shelfmember.html new file mode 100644 index 00000000..7b9cbea4 --- /dev/null +++ b/social/templates/event/boosted_shelfmember.html @@ -0,0 +1,8 @@ +{% load duration %} +boosted your mark on {{ event.item.display_title }} +
+ + {% if event.piece.mark.rating_grade %}{{ event.piece.mark.rating_grade|rating_star }}{% endif %} + + {{ event.piece.mark.comment.html|safe }} +diff --git a/social/templates/event/follow_requested.html b/social/templates/event/follow_requested.html new file mode 100644 index 00000000..98161365 --- /dev/null +++ b/social/templates/event/follow_requested.html @@ -0,0 +1,12 @@ +{% load bleach_tags %} +requested to follow you +
+ {% include 'users/profile_actions.html' with show_home=1 identity=event.identity %} +diff --git a/social/templates/event/followed.html b/social/templates/event/followed.html new file mode 100644 index 00000000..91864867 --- /dev/null +++ b/social/templates/event/followed.html @@ -0,0 +1,12 @@ +{% load bleach_tags %} +followed you +++ {{ event.identity.summary|bleach:"a,p,span,br"|default:"@{{ event.identity.full_handle }}
+
" }} +
+ {% include 'users/profile_actions.html' with show_home=1 identity=event.identity %} +diff --git a/social/templates/event/identity_created.html b/social/templates/event/identity_created.html new file mode 100644 index 00000000..50e9cb0c --- /dev/null +++ b/social/templates/event/identity_created.html @@ -0,0 +1 @@ +joined {{ site_name }} diff --git a/social/templates/event/liked.html b/social/templates/event/liked.html new file mode 100644 index 00000000..dd3c4b7a --- /dev/null +++ b/social/templates/event/liked.html @@ -0,0 +1,5 @@ +{% load bleach_tags %} +liked your post +++ {{ event.identity.summary|bleach:"a,p,span,br"|default:"@{{ event.identity.full_handle }}
+
" }} +
+ {{ event.post.content|bleach:"a,p,span,br,div,img"|default:"diff --git a/social/templates/event/liked_collection.html b/social/templates/event/liked_collection.html new file mode 100644 index 00000000..39cba0f3 --- /dev/null +++ b/social/templates/event/liked_collection.html @@ -0,0 +1 @@ +liked your collection {{ event.piece.title }} diff --git a/social/templates/event/liked_comment.html b/social/templates/event/liked_comment.html new file mode 100644 index 00000000..0f593efe --- /dev/null +++ b/social/templates/event/liked_comment.html @@ -0,0 +1,8 @@ +{% load duration %} +liked your comment on {{ event.item.display_title }} +
" }} +
+ + {% if event.piece.rating_grade %}{{ event.piece.rating_grade|rating_star }}{% endif %} + + {{ event.piece.html|safe }} +diff --git a/social/templates/event/liked_review.html b/social/templates/event/liked_review.html new file mode 100644 index 00000000..1f379eef --- /dev/null +++ b/social/templates/event/liked_review.html @@ -0,0 +1 @@ +liked your review {{ event.piece.title }} on {{ event.item.display_title }} diff --git a/social/templates/event/liked_shelfmember.html b/social/templates/event/liked_shelfmember.html new file mode 100644 index 00000000..02a5297c --- /dev/null +++ b/social/templates/event/liked_shelfmember.html @@ -0,0 +1,8 @@ +{% load duration %} +liked your mark on {{ event.item.display_title }} +
+ + {% if event.piece.mark.rating_grade %}{{ event.piece.mark.rating_grade|rating_star }}{% endif %} + + {{ event.piece.mark.comment.html|safe }} +diff --git a/social/templates/event/mentioned.html b/social/templates/event/mentioned.html new file mode 100644 index 00000000..ddd9103d --- /dev/null +++ b/social/templates/event/mentioned.html @@ -0,0 +1,6 @@ +{% load bleach_tags %} +mentioned you +
+ {{ event.post.content|bleach:"a,p,span,br,div,img"|default:"+{% include "events/_post.html" with post=event.reply %} diff --git a/social/templates/event/mentioned_collection.html b/social/templates/event/mentioned_collection.html new file mode 100644 index 00000000..bdf18471 --- /dev/null +++ b/social/templates/event/mentioned_collection.html @@ -0,0 +1,2 @@ +replied to your collection {{ event.piece.title }} +{% include "events/_post.html" with post=event.reply %} diff --git a/social/templates/event/mentioned_comment.html b/social/templates/event/mentioned_comment.html new file mode 100644 index 00000000..765919f7 --- /dev/null +++ b/social/templates/event/mentioned_comment.html @@ -0,0 +1,9 @@ +{% load duration %} +replied to your comment on {{ event.item.display_title }} +
" }} +
+ + {% if event.piece.rating_grade %}{{ event.piece.rating_grade|rating_star }}{% endif %} + + {{ event.piece.html|safe }} ++{% include "events/_post.html" with post=event.reply %} diff --git a/social/templates/event/mentioned_review.html b/social/templates/event/mentioned_review.html new file mode 100644 index 00000000..b188b7aa --- /dev/null +++ b/social/templates/event/mentioned_review.html @@ -0,0 +1,2 @@ +replied to your review {{ event.piece.title }} on {{ event.item.display_title }} +{% include "events/_post.html" with post=event.reply %} diff --git a/social/templates/event/mentioned_shelfmember.html b/social/templates/event/mentioned_shelfmember.html new file mode 100644 index 00000000..3ecc9385 --- /dev/null +++ b/social/templates/event/mentioned_shelfmember.html @@ -0,0 +1,9 @@ +{% load duration %} +replied to your mark on {{ event.item.display_title }} +
+ + {% if event.piece.mark.rating_grade %}{{ event.piece.mark.rating_grade|rating_star }}{% endif %} + + {{ event.piece.mark.comment.html|safe }} ++{% include "events/_post.html" with post=event.reply %} diff --git a/social/templates/event/post.html b/social/templates/event/post.html new file mode 100644 index 00000000..b0e0432f --- /dev/null +++ b/social/templates/event/post.html @@ -0,0 +1 @@ +unsupported notification: post diff --git a/social/templates/events.html b/social/templates/events.html new file mode 100644 index 00000000..48f548db --- /dev/null +++ b/social/templates/events.html @@ -0,0 +1,51 @@ +{% load static %} +{% load i18n %} +{% load l10n %} +{% load humanize %} +{% load admin_url %} +{% load mastodon %} +{% load oauth_token %} +{% load truncate %} +{% load thumb %} +{% load prettydate %} +{% load user_actions %} +{% load duration %} +{% for event in events %} +