summaryrefslogtreecommitdiffstats
path: root/blog
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2016-10-03 17:13:41 +0200
committerHarald Eilertsen <haraldei@anduin.net>2016-10-03 17:13:41 +0200
commit7dea54fb6e03afb6696c8a36e3af8bb27770eab3 (patch)
tree6d9caf689186c5e4edbac40c8ba53b2e51829542 /blog
parenteec3fd64a25cf264b96223011208f186d744993e (diff)
downloadnorsk-urskog-main-7dea54fb6e03afb6696c8a36e3af8bb27770eab3.tar.gz
norsk-urskog-main-7dea54fb6e03afb6696c8a36e3af8bb27770eab3.tar.bz2
norsk-urskog-main-7dea54fb6e03afb6696c8a36e3af8bb27770eab3.zip
Better rendering of the news feed the various places it's used.
Diffstat (limited to 'blog')
-rw-r--r--blog/_includes/news.html6
-rw-r--r--blog/_includes/post-excerpt.html7
-rw-r--r--blog/_layouts/default.html2
3 files changed, 11 insertions, 4 deletions
diff --git a/blog/_includes/news.html b/blog/_includes/news.html
index a8daaeb..e9f6138 100644
--- a/blog/_includes/news.html
+++ b/blog/_includes/news.html
@@ -2,7 +2,11 @@
<h2>{% t home.latest_news %}</h2>
{% for p in site.posts limit: 5 %}
{% if p != page %}
- {% include post-excerpt.html post=p %}
+ {% if include.sidebar %}
+ {% include post-excerpt.html post=p sidebar=true %}
+ {% else %}
+ {% include post-excerpt.html post=p %}
+ {% endif %}
{% endif %}
{% endfor %}
</section>
diff --git a/blog/_includes/post-excerpt.html b/blog/_includes/post-excerpt.html
index 52704e7..e87b12b 100644
--- a/blog/_includes/post-excerpt.html
+++ b/blog/_includes/post-excerpt.html
@@ -3,10 +3,13 @@
{% include post-header.html post = post %}
<section class="post-body">
{% if post.page-image %}
- {{ post.page-image | img: "magick:resize:290x" }}
+ {% if include.sidebar %}
+ {{ post.page-image | img: "magick:resize:290x" }}
+ {% else %}
+ {{ post.page-image | img: "magick:resize:290x class:right" }}
+ {% endif %}
{% endif %}
{{ post.excerpt }}
-
<p><a href="{{ post.url | prepend: site.baseurl }}">{% t global.read_more %}</a></p>
</section>
</article>
diff --git a/blog/_layouts/default.html b/blog/_layouts/default.html
index 2daf763..2488ce3 100644
--- a/blog/_layouts/default.html
+++ b/blog/_layouts/default.html
@@ -11,7 +11,7 @@
{{ content }}
</section>
<section id="side-body">
- {% include news.html %}
+ {% include news.html sidebar=true %}
{% if site.links %}
<section id="links">