summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--blog/_i18n/en.yml1
-rw-r--r--blog/_i18n/nb.yml1
-rw-r--r--blog/_includes/sponsors.html6
-rw-r--r--blog/_layouts/default.html16
-rw-r--r--blog/index.html35
5 files changed, 28 insertions, 31 deletions
diff --git a/blog/_i18n/en.yml b/blog/_i18n/en.yml
index cf02044..b5b0a8c 100644
--- a/blog/_i18n/en.yml
+++ b/blog/_i18n/en.yml
@@ -3,6 +3,7 @@ global:
norwegian: Norsk
english: English
read_more: Read more...
+ our_sponsors: Our sponsors
titles:
home: Home
diff --git a/blog/_i18n/nb.yml b/blog/_i18n/nb.yml
index a4aa43c..d6601ae 100644
--- a/blog/_i18n/nb.yml
+++ b/blog/_i18n/nb.yml
@@ -3,6 +3,7 @@ global:
norwegian: norsk
english: English
read_more: Les mer...
+ our_sponsors: VĂ¥re sponsorer
titles:
home: Hjem
diff --git a/blog/_includes/sponsors.html b/blog/_includes/sponsors.html
index c2260c5..c03af6a 100644
--- a/blog/_includes/sponsors.html
+++ b/blog/_includes/sponsors.html
@@ -1,6 +1,10 @@
-
<div class="sponsor-logos large">
<span class="logo">
+ <a href="http://ds-media.no">
+ {% image "2014/sponsors/ds_banner_2014.jpg" alt="DS-Media" %}
+ </a>
+ </span>
+ <span class="logo">
<a href="http://trineogkim.no/">
{% image "2014/sponsors/Trine og Kim 2014.png" alt="Trine og Kim Design Studio" %}
</a>
diff --git a/blog/_layouts/default.html b/blog/_layouts/default.html
index a2458fd..676adb1 100644
--- a/blog/_layouts/default.html
+++ b/blog/_layouts/default.html
@@ -7,7 +7,21 @@
<section id="page">
<section id="body-content">
- {{ content }}
+ <section id="body">
+ {{ content }}
+ </section>
+ <section id="side-body">
+ <h2>{% t global.our_sponsors %}</h2>
+ <section id="sponsor-pos-1">
+ {% include sponsors.html %}
+ </section>
+
+ {% if site.links %}
+ <section id="links">
+ <h2>{% t home.links %}</h2>
+ </section>
+ {% endif %}
+ </section>
</section>
</section>
diff --git a/blog/index.html b/blog/index.html
index 5abd279..284dc1b 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -2,34 +2,11 @@
layout: default
---
-<section id="body">
- {% tf home/intro.md %}
+<h2>{% t home.latest_news %}</h2>
+<section id="news">
+ {% for p in paginator.posts %}
+ {% include post-excerpt.html post=p %}
+ {% endfor %}
- <section id="sponsor-pos-2">
- {% include sponsors.html %}
- </section>
-</section>
-
-<section id="side-body">
- <section id="sponsor-pos-1">
- <a href="http://ds-media.no">
- {% image "2014/sponsors/ds_banner_2014.jpg" alt="DS-Media" %}
- </a>
- </section>
-
- <section id="news">
- <h2>{% t home.latest_news %}</h2>
- {% for p in paginator.posts %}
- {% include post-excerpt.html post=p %}
- {% endfor %}
-
- {% include pagination.html %}
-
- </section>
-
- {% if site.links %}
- <section id="links">
- <h2>{% t home.links %}</h2>
- </section>
- {% endif %}
+ {% include pagination.html %}
</section>