diff --git a/po/de.po b/po/de.po index b45843e9..89940da7 100644 --- a/po/de.po +++ b/po/de.po @@ -351,3 +351,23 @@ msgstr "" msgid "Next page" msgstr "" + +#, fuzzy +msgid "{{ user }} mentioned you." +msgstr "{{ data }} hat dich erwähnt." + +#, fuzzy +msgid "{{ user }} commented your article." +msgstr "{{ data }} hat deinen Artikel kommentiert" + +#, fuzzy +msgid "{{ user }} is now following you." +msgstr "{{ data }} folgt dir nun" + +#, fuzzy +msgid "{{ user }} liked your article." +msgstr "{{ data }} hat deinen Artikel geliked" + +#, fuzzy +msgid "{{ user }} reshared your article." +msgstr "{{ data }} hat deinen Artikel reshared" diff --git a/po/en.po b/po/en.po index 61639615..cc09dcf9 100644 --- a/po/en.po +++ b/po/en.po @@ -343,3 +343,18 @@ msgstr "" msgid "Next page" msgstr "" + +msgid "{{ user }} mentioned you." +msgstr "" + +msgid "{{ user }} commented your article." +msgstr "" + +msgid "{{ user }} is now following you." +msgstr "" + +msgid "{{ user }} liked your article." +msgstr "" + +msgid "{{ user }} reshared your article." +msgstr "" diff --git a/po/fr.po b/po/fr.po index a222daae..5c54aa49 100644 --- a/po/fr.po +++ b/po/fr.po @@ -347,3 +347,23 @@ msgstr "" msgid "Next page" msgstr "" + +#, fuzzy +msgid "{{ user }} mentioned you." +msgstr "{{ data }} vous a mentionné." + +#, fuzzy +msgid "{{ user }} commented your article." +msgstr "{{ data }} a commenté votre article" + +#, fuzzy +msgid "{{ user }} is now following you." +msgstr "{{ data }} vous suit" + +#, fuzzy +msgid "{{ user }} liked your article." +msgstr "{{ data }} a aimé votre article" + +#, fuzzy +msgid "{{ user }} reshared your article." +msgstr "{{ data }} a repartagé votre article" diff --git a/po/pl.po b/po/pl.po index 775c04e8..b3579b1b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -356,5 +356,25 @@ msgstr "" msgid "Next page" msgstr "" +#, fuzzy +msgid "{{ user }} mentioned you." +msgstr "{{ data }} wspomniał o Tobie." + +#, fuzzy +msgid "{{ user }} commented your article." +msgstr "{{ data }} skomentował Twój artykuł" + +#, fuzzy +msgid "{{ user }} is now following you." +msgstr "{{ data }} zaczął Cię obserwować" + +#, fuzzy +msgid "{{ user }} liked your article." +msgstr "{{ data }} polubił Twój artykuł" + +#, fuzzy +msgid "{{ user }} reshared your article." +msgstr "{{ data }} udostępnił Twój artykuł" + #~ msgid "Logowanie" #~ msgstr "Zaloguj się" diff --git a/po/plume.pot b/po/plume.pot index 31806f63..7d02ab95 100644 --- a/po/plume.pot +++ b/po/plume.pot @@ -349,5 +349,5 @@ msgstr "" msgid "{{ user }} liked your article." msgstr "" -msgstr "{{ user }} reshare your article." -msgid "" +msgid "{{ user }} reshared your article." +msgstr "" diff --git a/static/main.css b/static/main.css index c946fde9..35341678 100644 --- a/static/main.css +++ b/static/main.css @@ -468,7 +468,7 @@ form.new-post input[type="submit"]:hover { background: #DADADA; } .list .card { /* TODO */ background: 0; - margin: 0; + margin: 2em 0; padding: 0; min-height: 0; } @@ -555,3 +555,22 @@ form.new-post input[type="submit"]:hover { background: #DADADA; } .pagination > * { padding: 2em; } + +/*== Flex boxes ==*/ +.flex { + display: flex; + flex-direction: row; +} + +.flex .grow { + flex: 1; +} + +.left-icon { + align-self: center; + padding: 1em; + background: #DADADA; + border-radius: 50px; + margin: 1em; + margin-right: 2em; +} diff --git a/templates/notifications/index.html.tera b/templates/notifications/index.html.tera index 8c4f194e..859b0069 100644 --- a/templates/notifications/index.html.tera +++ b/templates/notifications/index.html.tera @@ -9,34 +9,49 @@

{{ "Notifications" | _ }}

{% for notification in notifications %} -
+
{% if notification.kind == "COMMENT" %} -

- {{ "{{ user }} commented your article." | _(user=notification.object.user.display_name) }} -

-

{{ notification.object.post.title }}

+ +
+

+ {{ "{{ user }} commented your article." | _(user=notification.object.user.display_name | escape) }} +

+

{{ notification.object.post.post.title }}

+
{% elif notification.kind == "FOLLOW" %} -

- {{ "{{ user }} is now following you." | _(user=notification.object.follower.display_name) }} -

+ +
+

+ {{ "{{ user }} is now following you." | _(user=notification.object.follower.display_name | escape) }} +

+
{% elif notification.kind == "LIKE" %} -

- {{ "{{ user }} liked your article." | _(user=notification.object.user.display_name) }} -

-

{{ notification.object.post.title }}

+ +
+

+ {{ "{{ user }} liked your article." | _(user=notification.object.user.display_name | escape) }} +

+

{{ notification.object.post.post.title }}

+
{% elif notification.kind == "MENTION" %} -

- {{ "{{ user }} mentioned you." | _(user=notification.object.user.display_name) }} -

+ +
+

+ {{ "{{ user }} mentioned you." | _(user=notification.object.user.display_name | escape) }} +

+
{% elif notification.kind == "RESHARE" %} -

- {{ "{{ user }} reshare your article." | _(user=notification.object.user.display_name) }} -

-

{{ notification.object.post.title }}

+ +
+

+ {{ "{{ user }} reshared your article." | _(user=notification.object.user.display_name | escape) }} +

+

{{ notification.object.post.post.title }}

+
{% endif %}