diff --git a/Makefile b/Makefile index 20d7ddd..02e6c34 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ .PHONY: help build publish -VERSION = 1.0.31 +VERSION = 1.0.32 help: @perl -nle'print $& if m{^[a-zA-Z_-]+:.*?## .*$$}' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' @@ -11,4 +11,4 @@ publish: @docker push code.headbright.be/konstantin/iamkonstantin:$(VERSION) bump: @bash ./bump_version.sh -upgrade: bump build publish \ No newline at end of file +upgrade: build publish \ No newline at end of file diff --git a/blog/templates/blog/blog_index_page.html b/blog/templates/blog/blog_index_page.html index 883adbf..5ddad22 100644 --- a/blog/templates/blog/blog_index_page.html +++ b/blog/templates/blog/blog_index_page.html @@ -6,64 +6,64 @@ {% block content %} -
-
-
-

{{ page.title }}

-
{{ page.intro|richtext }}
+
-
- {% for post in blogpages %} - {% with post=post.specific %} -
-
-

- - - {{ post.title }} - -

-

{{ post.intro }}

-
- {% if post.main_image %} -
- {% with post.main_image as main_image %} - {% if main_image %} - {% image main_image width-1600 class="blog absolute inset-0 h-full w-full rounded-2xl bg-gray-50 object-cover" %}{% endif %} - {% endwith %} -
-
- {% endif %} -
-
- -
+
+

{{ page.title }}

+
{{ page.intro|richtext }}
- {% with tags=post.tags.all %} - {% if tags %} -
-

Tags

-
    - {% for tag in tags %} -
  • 🏷️ - {{ tag }} -
    • - {% endfor %} -
-
- {% endif %} +
+ {% for post in blogpages %} + {% with post=post.specific %} +
+
+

+ + + {{ post.title }} + +

+

{{ post.intro }}

+
+ {% if post.main_image %} +
+ {% with post.main_image as main_image %} + {% if main_image %} + {% image main_image width-1600 class="blog absolute inset-0 h-full w-full rounded-2xl bg-gray-50 object-cover" %}{% endif %} {% endwith %} +
+
+ {% endif %} +
+
+
-
- {% endwith %} - {% endfor %} -
+ {% with tags=post.tags.all %} + {% if tags %} +
+

Tags

+
    + {% for tag in tags %} +
  • 🏷️ + {{ tag }} +
    • + {% endfor %} +
+
+ {% endif %} + {% endwith %} +
+ +
+ {% endwith %} + {% endfor %}
+
{% endblock %} \ No newline at end of file diff --git a/blog/templates/blog/blog_page.html b/blog/templates/blog/blog_page.html index dd0caf9..5e85027 100644 --- a/blog/templates/blog/blog_page.html +++ b/blog/templates/blog/blog_page.html @@ -6,7 +6,7 @@ {% block content %}
-
+

{{ page.title }}

{% with authors=page.authors.all %} @@ -37,7 +37,7 @@ {% endwith %} -
+
{{ page.intro }}
{{ page.body }} diff --git a/blog/templates/blog/blog_tag_index_page.html b/blog/templates/blog/blog_tag_index_page.html index 35cae21..5e1116e 100644 --- a/blog/templates/blog/blog_tag_index_page.html +++ b/blog/templates/blog/blog_tag_index_page.html @@ -1,25 +1,68 @@ {% extends "base.html" %} -{% load wagtailcore_tags %} +{% load wagtailcore_tags wagtailimages_tags %} {% block content %} -
-
- {% if request.GET.tag %} -

Showing pages tagged "{{ request.GET.tag }}"

- {% endif %} +
+
+

{{ request.GET.tag }}

+

{{ page.intro|richtext }}

- {% for blogpage in blogpages %} +
+ {% for post in blogpages %} + {% with post=post.specific %} +
+
+

+ + + {{ post.title }} + +

+

{{ post.intro }}

+
+ {% if post.main_image %} +
+ {% with post.main_image as main_image %} + {% if main_image %} + {% image main_image width-1600 class="blog absolute inset-0 h-full w-full rounded-2xl bg-gray-50 object-cover" %}{% endif %} + {% endwith %} +
+
+ {% endif %} +
+
+ +
-

- {{ blogpage.title }}
- Revised: {{ blogpage.latest_revision_created_at }}
-

+ {% with tags=post.tags.all %} + {% if tags %} +
+

Tags

+
    + {% for tag in tags %} +
  • 🏷️ + {{ tag }} +
    • + {% endfor %} +
+
+ {% endif %} + {% endwith %} +
- {% empty %} - No pages found with that tag. - {% endfor %} -
+
+ {% endwith %} + + {% empty %} + No pages found with that tag. + {% endfor %} + +
+ {% endblock %} \ No newline at end of file diff --git a/media/images/moon_and_planets_design.original.jpg b/media/images/moon_and_planets_design.original.jpg new file mode 100644 index 0000000..074d2c1 Binary files /dev/null and b/media/images/moon_and_planets_design.original.jpg differ