migrate blog to foundation

5 files changed, 27 insertions, 40 deletions

diff --git a/config.rb b/config.rb
index f24cebb..ec93867 100644
--- a/config.rb
+++ b/config.rb
@@ -12,7 +12,7 @@ activate :blog do |blog|
   # Matcher for blog source files
   # blog.sources = "{year}-{month}-{day}-{title}.html"
   # blog.taglink = "tags/{tag}.html"
-  # blog.layout = "layout"
+  blog.layout = "article_layout"
   # blog.summary_separator = /(READMORE)/
   # blog.summary_length = 250
 
diff --git a/source/_article.html.haml b/source/_article.html.haml
index 7194cdb..a276a81 100644
--- a/source/_article.html.haml
+++ b/source/_article.html.haml
@@ -1,5 +1,7 @@
-%article
-  %aside.blog-date= article.date.strftime('%e %b %Y')
-  .blog-inner
-    %h3.blog-article-heading= link_to article.title, article
-    = article.body
+.row
+  .column
+    %article
+      %aside.blog-date= article.date.strftime('%e %b %Y')
+      .blog-inner
+        %h3.blog-article-heading= link_to article.title, article
+        = article.body
diff --git a/source/aktuelles/blog.html.haml b/source/aktuelles/blog.html.haml
index fbbffcd..875fb54 100644
--- a/source/aktuelles/blog.html.haml
+++ b/source/aktuelles/blog.html.haml
@@ -3,12 +3,14 @@ pageable: true
 per_page: 10
 section: "aktuelles"
 ---
-- if paginate && num_pages > 1
-  %ul.pager
-    %li{:class => "previous #{prev_page ? "" : "disabled"}"}= link_to 'Vorherige Seite', prev_page
-    %li{:class => "next #{next_page ? "" : "disabled"}"}= link_to 'Nächste Seite', next_page
+.pagination-centered
+  - if paginate && num_pages > 1
+    %ul.pagination
+      %li{:class => "previous left #{prev_page ? "" : "disabled"}"}= link_to 'Vorherige Seite', prev_page
+      %li{:class => "next right #{next_page ? "" : "disabled"}"}= link_to 'Nächste Seite', next_page
 = partial "article", collection: page_articles
-- if paginate && num_pages > 1
-  %ul.pager
-    %li{:class => "previous #{prev_page ? "" : "disabled"}"}= link_to 'Vorherige Seite', prev_page
-    %li{:class => "next #{next_page ? "" : "disabled"}"}= link_to 'Nächste Seite', next_page
+.pagination-centered
+  - if paginate && num_pages > 1
+    %ul.pagination
+      %li{:class => "previous left #{prev_page ? "" : "disabled"}"}= link_to 'Vorherige Seite', prev_page
+      %li{:class => "next right #{next_page ? "" : "disabled"}"}= link_to 'Nächste Seite', next_page
diff --git a/source/aktuelles/index.html.haml b/source/aktuelles/index.html.haml
deleted file mode 100644
index 59eccd8..0000000
--- a/source/aktuelles/index.html.haml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-section: "aktuelles"
----
-%div
-  %h3 Demnächst im sublab
-  %p BattleMeshV7 - 12. bis 18. Mai 2014
-  %p CryptoCon14 - 22. bis 25. Mai 2014
-%div
-  %h3 Neues aus dem sublab
-  %p= link_to "Alle News >>", "/news.html"
-  = partial "article_summary", collection: blog.articles[0..2]
-%div
-  %h3 @sublab tweets
-  %p
-    %strong sublab
-    @sublab Apr 5
-    %br/
-    WTF? LOL!
-  %p
-    %strong about:radio
-    @aboutradio Apr 5
-    %br/
-    Heute von 16-18Uhr: about:radio u.a. zu den Themen: Libre Graphics Meeting in Leipzig, Kamera in der Simildenstrasse
-%div
-  %h3 Wiki Aktivität
-  = partial "wiki_changes"
diff --git a/source/layouts/article_layout.html.haml b/source/layouts/article_layout.html.haml
new file mode 100644
index 0000000..30fd382
--- /dev/null
+++ b/source/layouts/article_layout.html.haml
@@ -0,0 +1,9 @@
+-# TODO de-duplicate with _article partial
+= wrap_layout :layout do
+  .row
+    .column
+      %article
+        %aside.blog-date= current_article.date.strftime('%e %b %Y')
+        .blog-inner
+          %h3.blog-article-heading= current_article.title
+          = yield