diff --git a/src/blog/templates/blog/author_index_page.html b/src/blog/templates/blog/author_index_page.html index 0313df0..58fd910 100644 --- a/src/blog/templates/blog/author_index_page.html +++ b/src/blog/templates/blog/author_index_page.html @@ -3,7 +3,7 @@ {% block content %}
-
+

{{ page.title }}

diff --git a/src/blog/templates/blog/author_page.html b/src/blog/templates/blog/author_page.html index d37565b..b815978 100644 --- a/src/blog/templates/blog/author_page.html +++ b/src/blog/templates/blog/author_page.html @@ -3,9 +3,13 @@ {% block content %}
-
-

{{ page.title }}

- +
+
+

{{ page.title }}

+ {% include "blog/includes/subscribe-author.html" with author=page.user user=user class="h-10 w-10" %} +
+ +
{% user_avatar page.user %} diff --git a/src/blog/templates/blog/blog_index_page.html b/src/blog/templates/blog/blog_index_page.html index 4e730a8..cf75f68 100644 --- a/src/blog/templates/blog/blog_index_page.html +++ b/src/blog/templates/blog/blog_index_page.html @@ -4,7 +4,7 @@ {% block content %} {% include "blog/includes/timeline.html" with grouped_blog_posts=grouped_blog_posts itinerary=itinerary %} -
+
{% include "blog/includes/filter-bar.html" %} {% include "blog/includes/blogpost-grid.html" with blogposts=blogpages only %}
diff --git a/src/blog/templates/blog/blog_page.html b/src/blog/templates/blog/blog_page.html index 1319db9..a48d705 100644 --- a/src/blog/templates/blog/blog_page.html +++ b/src/blog/templates/blog/blog_page.html @@ -14,36 +14,52 @@ {% else %}
{% endif %} -
-
+
+
+ +
+ {% include "blog/includes/subscribe-author.html" with author=page.author user=user class="h-10 w-10" %} +
+
+ +
-

{{ page.title }}

-
{{ page.specific.date | date:"d-m-Y H:i" }}
-
- +

{{ page.title }}

+
+
+
{{ page.specific.date | date:"d-m-Y H:i" }}
+
+ {% for location in page.location.all %} + 📍{{location.name}} + {% endfor %} +
+
+ {% if page.author.author_page %} + + + {% post_user_avatar page 'w-10 h-10 rounded-full object-cover sm:w-12 sm:h-12' %} + + {% else %} +
+ + {% post_user_avatar page %} +
+ {% endif %}
- {% if page.author.author_page %} - - - {% post_user_avatar page 'w-10 h-10 rounded-full object-cover sm:w-16 sm:h-16' %} - - {% else %} -
- - {% post_user_avatar page %} -
- {% endif %} - {% include "blog/includes/subscribe-author.html" with author=page.author user=user %} +
{% if page.hero_text %}
@@ -121,9 +137,9 @@

+
{% for post in blogposts %}
{% endif %} +
+
+ 😻 + {{ post.specific.like_count }} + 💬 + {{ post.specific.comments.count }} +
+

{{ post.title }}

-
+
{% post_user_avatar post 'w-8 h-8 rounded-full object-cover' %} - {{ post.specific.date | date:"d-m-Y H:i" }} -
- 😻 - {{ post.specific.like_count }} - 💬 - {{ post.specific.comments.count }} +
+
+ {{ post.specific.date | date:"d-m-Y H:i" }} +
+
+ {% for location in post.location.all %} + 📍{{location.name}} + {% endfor %} +
-
- {% if post.specific.intro %} -
{{ post.specific.intro }}
- {% else %} - {{ post.specific.body|richtext|slice:":500" }} - {% endif %} -
+ {% if post.specific.intro %} +
{{ post.specific.intro }}
+ {% else %} + {{ post.specific.body|richtext|slice:":500" }} + {% endif %}
diff --git a/src/blog/templates/blog/includes/filter-bar.html b/src/blog/templates/blog/includes/filter-bar.html index 742bc19..6fc981e 100644 --- a/src/blog/templates/blog/includes/filter-bar.html +++ b/src/blog/templates/blog/includes/filter-bar.html @@ -1,6 +1,6 @@ {% load wagtailcore_tags wagtailimages_tags user_tags %} -
+
diff --git a/src/blog/templates/blog/includes/subscribe-author.html b/src/blog/templates/blog/includes/subscribe-author.html index 4bcfc31..57ce2ec 100644 --- a/src/blog/templates/blog/includes/subscribe-author.html +++ b/src/blog/templates/blog/includes/subscribe-author.html @@ -1,6 +1,15 @@ {% if user.is_authenticated %} -