summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Henrik Mai <lars.mai@kontinui.de>2014-10-21 23:37:40 +0200
committerLars Henrik Mai <lars.mai@kontinui.de>2014-10-21 23:37:40 +0200
commit90c0d3659850d71119a2825cfedc85f18e9c768f (patch)
tree706149937eab494e8563bc44348d7d75abb2c0e2
parent4bdf438a0a0cfc1a3a4b099664883ab5a50baeff (diff)
layout fixes blog and calendar
-rw-r--r--source/aktuelles/blog.html.haml4
-rw-r--r--source/aktuelles/kalender.html.haml9
2 files changed, 9 insertions, 4 deletions
diff --git a/source/aktuelles/blog.html.haml b/source/aktuelles/blog.html.haml
index 875fb54..68f4c20 100644
--- a/source/aktuelles/blog.html.haml
+++ b/source/aktuelles/blog.html.haml
@@ -3,12 +3,16 @@ pageable: true
per_page: 10
section: "aktuelles"
---
+%h2
+ News
.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
+
.pagination-centered
- if paginate && num_pages > 1
%ul.pagination
diff --git a/source/aktuelles/kalender.html.haml b/source/aktuelles/kalender.html.haml
index 437bc52..f9de063 100644
--- a/source/aktuelles/kalender.html.haml
+++ b/source/aktuelles/kalender.html.haml
@@ -3,15 +3,16 @@ section: "aktuelles"
---
%h2
Termine
+
- data.calendar.map {|data| CalendarHelpers::Event.new(data)}.each do |ev|
.row
- .large-12.columns
+ .small-12.columns
%h4= ev.date
- .row
- .large-2.large-offset-1.columns
+ .row.panel
+ .small-6.columns
%span= ev.start_time
\-
%span= ev.end_time
- .large-9.columns
+ .small-6.columns
%span= ev.summary