diff --git a/digitalglarus/templates/glarus_blog/post_detail.html b/digitalglarus/templates/glarus_blog/post_detail.html index ed71df5e..ae69dc5b 100644 --- a/digitalglarus/templates/glarus_blog/post_detail.html +++ b/digitalglarus/templates/glarus_blog/post_detail.html @@ -8,18 +8,26 @@ {% block content_blog %}{% spaceless %}
-
-

{{ post.title }}

- {% block blog_meta %} - {% include "glarus_blog/includes/blog_meta.html" %} - {% endblock %} + {% if post.main_image_id %} +
+ {% thumbnail post.main_image post.full_image_options.size crop=post.full_image_options.crop upscale=post.full_image_options.upscale subject_location=post.main_image.subject_location as thumb %} + {{ post.main_image.default_alt_text }} +
+ {% endif %} +
+

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

+ {% block blog_meta %} + {% include "glarus_blog/includes/blog_meta.html" %} + {% endblock %}
- {% if post.main_image_id %} -
- {% thumbnail post.main_image post.full_image_options.size crop=post.full_image_options.crop upscale=post.full_image_options.upscale subject_location=post.main_image.subject_location as thumb %} - {{ post.main_image.default_alt_text }} -
- {% endif %} {% endspaceless %}
{% render_placeholder post.content %}
diff --git a/digitalglarus/templates/glarus_blog/post_list.html b/digitalglarus/templates/glarus_blog/post_list.html index d640f30e..a55a82a5 100644 --- a/digitalglarus/templates/glarus_blog/post_list.html +++ b/digitalglarus/templates/glarus_blog/post_list.html @@ -7,35 +7,34 @@
{% block blog_title %}
-

- {% if author %}{% trans "Articles by" %} {{ author.get_full_name }} - {% elif archive_date %}{% trans "Archive" %} – {% if month %}{{ archive_date|date:'F' }} {% endif %}{{ year }} - {% elif tagged_entries %}{% trans "Tag" %} – {{ tagged_entries|capfirst }} - {% elif category %}{% trans "Category" %} – {{ category }}{% endif %} -

+
+

+ Digital Glarus Blog +

+
{% endblock %} {% for post in post_list %} - {% include "glarus_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %} + {% include "glarus_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %} {% empty %} -

{% trans "No article found." %}

+

{% trans "No article found." %}

{% endfor %} {% if author or archive_date or tagged_entries %}

{% trans "Back" %}

{% endif %} {% if is_paginated %} {% endif %}
{% endblock %} -{% endspaceless %} \ No newline at end of file +{% endspaceless %}