From 9de59307c9cddf689ea3f302571bb6cfd0d689fa Mon Sep 17 00:00:00 2001 From: Lars Henrik Mai Date: Sun, 21 Sep 2014 11:31:35 +0200 Subject: converted templates from erb to haml --- source/aktuelles/blog.html.erb | 24 ------------------------ source/aktuelles/blog.html.haml | 14 ++++++++++++++ source/aktuelles/index.html.erb | 35 ----------------------------------- source/aktuelles/index.html.haml | 26 ++++++++++++++++++++++++++ source/aktuelles/kalender.html.erb | 7 ------- source/aktuelles/kalender.html.haml | 5 +++++ 6 files changed, 45 insertions(+), 66 deletions(-) delete mode 100644 source/aktuelles/blog.html.erb create mode 100644 source/aktuelles/blog.html.haml delete mode 100644 source/aktuelles/index.html.erb create mode 100644 source/aktuelles/index.html.haml delete mode 100644 source/aktuelles/kalender.html.erb create mode 100644 source/aktuelles/kalender.html.haml (limited to 'source/aktuelles') 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 %> - - - -<% end %> - -<%= partial "article", collection: page_articles %> - -<% if paginate && num_pages > 1 %> - - - -<% end %> diff --git a/source/aktuelles/blog.html.haml b/source/aktuelles/blog.html.haml new file mode 100644 index 0000000..8be9786 --- /dev/null +++ b/source/aktuelles/blog.html.haml @@ -0,0 +1,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 += 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 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" ---- - -
-

Demnächst im sublab

- -

BattleMeshV7 - 12. bis 18. Mai 2014

-

CryptoCon14 - 22. bis 25. Mai 2014

-
- -
-

Neues aus dem sublab

- -

<%= link_to "Alle News >>", "/news.html" %>

- <%= partial "article_summary", collection: blog.articles[0..2] %> -
- -
-

@sublab tweets

-

- sublab @sublab Apr 5
- WTF? LOL! -

-

- about:radio @aboutradio Apr 5
- Heute von 16-18Uhr: about:radio u.a. zu den Themen: Libre Graphics Meeting in Leipzig, Kamera in der Simildenstrasse -

-
- -
-

Wiki Aktivität

- <%= partial "wiki_changes" %> -
- diff --git a/source/aktuelles/index.html.haml b/source/aktuelles/index.html.haml new file mode 100644 index 0000000..48de292 --- /dev/null +++ b/source/aktuelles/index.html.haml @@ -0,0 +1,26 @@ +\--- +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/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" ---- - -
- <%= lorem.paragraph %> -
diff --git a/source/aktuelles/kalender.html.haml b/source/aktuelles/kalender.html.haml new file mode 100644 index 0000000..6552af1 --- /dev/null +++ b/source/aktuelles/kalender.html.haml @@ -0,0 +1,5 @@ +\--- +section: "aktuelles" +\--- +%div + = lorem.paragraph -- cgit v1.2.1 From f3100ad9d93fd31a043594815e260958f5ceaff0 Mon Sep 17 00:00:00 2001 From: Lars Henrik Mai Date: Sun, 21 Sep 2014 11:51:57 +0200 Subject: fix some conversion errors --- source/aktuelles/blog.html.haml | 4 ++-- source/aktuelles/index.html.haml | 4 ++-- source/aktuelles/kalender.html.haml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source/aktuelles') diff --git a/source/aktuelles/blog.html.haml b/source/aktuelles/blog.html.haml index 8be9786..fbbffcd 100644 --- a/source/aktuelles/blog.html.haml +++ b/source/aktuelles/blog.html.haml @@ -1,8 +1,8 @@ -\--- +--- 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 diff --git a/source/aktuelles/index.html.haml b/source/aktuelles/index.html.haml index 48de292..59eccd8 100644 --- a/source/aktuelles/index.html.haml +++ b/source/aktuelles/index.html.haml @@ -1,6 +1,6 @@ -\--- +--- section: "aktuelles" -\--- +--- %div %h3 Demnächst im sublab %p BattleMeshV7 - 12. bis 18. Mai 2014 diff --git a/source/aktuelles/kalender.html.haml b/source/aktuelles/kalender.html.haml index 6552af1..4c809f4 100644 --- a/source/aktuelles/kalender.html.haml +++ b/source/aktuelles/kalender.html.haml @@ -1,5 +1,5 @@ -\--- +--- section: "aktuelles" -\--- +--- %div = lorem.paragraph -- cgit v1.2.1 From 63dbddf6c3d36549e55b80d4c720303d04dd3175 Mon Sep 17 00:00:00 2001 From: Lars Henrik Mai Date: Sun, 21 Sep 2014 15:00:33 +0200 Subject: migrate blog to foundation --- source/aktuelles/blog.html.haml | 18 ++++++++++-------- source/aktuelles/index.html.haml | 26 -------------------------- 2 files changed, 10 insertions(+), 34 deletions(-) delete mode 100644 source/aktuelles/index.html.haml (limited to 'source/aktuelles') 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" -- cgit v1.2.1