summaryrefslogtreecommitdiff
path: root/source/aktuelles
diff options
context:
space:
mode:
authorLars Henrik Mai <lars.mai@kontinui.de>2014-09-23 08:44:31 +0200
committerLars Henrik Mai <lars.mai@kontinui.de>2014-09-23 08:44:31 +0200
commit7fc6575a7a38daa21a26e2b179a92ca809b61eea (patch)
tree679498b3fd59aa375c6c6ce7ba48ed3d6a6e11d7 /source/aktuelles
parent35239fc1f4641db1e602383b43cc29b151cde9b9 (diff)
parent1c177d628ffdb693483b1c39b94b5f19adcd8095 (diff)
Merge branch 'replace-bootstrap-with-foundation'
Diffstat (limited to 'source/aktuelles')
-rw-r--r--source/aktuelles/blog.html.erb24
-rw-r--r--source/aktuelles/blog.html.haml16
-rw-r--r--source/aktuelles/index.html.erb35
-rw-r--r--source/aktuelles/kalender.html.erb7
-rw-r--r--source/aktuelles/kalender.html.haml5
5 files changed, 21 insertions, 66 deletions
diff --git a/source/aktuelles/blog.html.erb b/source/aktuelles/blog.html.erb
deleted file mode 100644
index 18666b9..0000000
--- a/source/aktuelles/blog.html.erb
+++ /dev/null
@@ -1,24 +0,0 @@
----
-pageable: true
-per_page: 10
-section: "aktuelles"
----
-<% if paginate && num_pages > 1 %>
-
- <ul class="pager">
- <li class="previous <%= prev_page ? "" : "disabled" %>"><%= link_to 'Vorherige Seite', prev_page %></li>
- <li class="next <%= next_page ? "" : "disabled" %>"><%= link_to 'Nächste Seite', next_page %></li>
- </ul>
-
-<% end %>
-
-<%= partial "article", collection: page_articles %>
-
-<% if paginate && num_pages > 1 %>
-
- <ul class="pager">
- <li class="previous <%= prev_page ? "" : "disabled" %>"><%= link_to 'Vorherige Seite', prev_page %></li>
- <li class="next <%= next_page ? "" : "disabled" %>"><%= link_to 'Nächste Seite', next_page %></li>
- </ul>
-
-<% end %>
diff --git a/source/aktuelles/blog.html.haml b/source/aktuelles/blog.html.haml
new file mode 100644
index 0000000..875fb54
--- /dev/null
+++ b/source/aktuelles/blog.html.haml
@@ -0,0 +1,16 @@
+---
+pageable: true
+per_page: 10
+section: "aktuelles"
+---
+.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
+ %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.erb b/source/aktuelles/index.html.erb
deleted file mode 100644
index 7fad840..0000000
--- a/source/aktuelles/index.html.erb
+++ /dev/null
@@ -1,35 +0,0 @@
----
-section: "aktuelles"
----
-
-<div>
- <h3>Demnächst im sublab</h3>
-
- <p>BattleMeshV7 - 12. bis 18. Mai 2014</p>
- <p>CryptoCon14 - 22. bis 25. Mai 2014</p>
-</div>
-
-<div>
- <h3>Neues aus dem sublab</h3>
-
- <p><%= link_to "Alle News >>", "/news.html" %></p>
- <%= partial "article_summary", collection: blog.articles[0..2] %>
-</div>
-
-<div>
- <h3>@sublab tweets</h3>
- <p>
- <strong>sublab</strong> @sublab Apr 5<br>
- WTF? LOL!
- </p>
- <p>
- <strong>about:radio</strong> @aboutradio Apr 5<br>
- Heute von 16-18Uhr: about:radio u.a. zu den Themen: Libre Graphics Meeting in Leipzig, Kamera in der Simildenstrasse
- </p>
-</div>
-
-<div>
- <h3>Wiki Aktivität</h3>
- <%= partial "wiki_changes" %>
-</div>
-
diff --git a/source/aktuelles/kalender.html.erb b/source/aktuelles/kalender.html.erb
deleted file mode 100644
index bf202dc..0000000
--- a/source/aktuelles/kalender.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
----
-section: "aktuelles"
----
-
-<div>
- <%= lorem.paragraph %>
-</div>
diff --git a/source/aktuelles/kalender.html.haml b/source/aktuelles/kalender.html.haml
new file mode 100644
index 0000000..4c809f4
--- /dev/null
+++ b/source/aktuelles/kalender.html.haml
@@ -0,0 +1,5 @@
+---
+section: "aktuelles"
+---
+%div
+ = lorem.paragraph