From 454e1624b45107adb5d140dcdae3e7bfb554c88f Mon Sep 17 00:00:00 2001 From: Lars Henrik Mai Date: Sun, 21 Sep 2014 11:23:51 +0200 Subject: added html2haml gem --- Gemfile | 3 +++ Gemfile.lock | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/Gemfile b/Gemfile index e391030..51aee43 100644 --- a/Gemfile +++ b/Gemfile @@ -22,3 +22,6 @@ gem "nokogiri" # we use bootstrap-sass gem "bootstrap-sass" + +# templating +gem "html2haml" diff --git a/Gemfile.lock b/Gemfile.lock index 17095fc..7a42ab5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,6 +35,12 @@ GEM hike (1.2.3) hooks (0.4.0) uber (~> 0.0.4) + hpricot (0.8.6) + html2haml (1.0.1) + erubis (~> 2.7.0) + haml (>= 4.0.0.rc.1) + hpricot (~> 0.8.6) + ruby_parser (~> 3.1.1) http_parser.rb (0.5.3) i18n (0.6.9) json (1.8.1) @@ -108,7 +114,10 @@ GEM ffi (>= 0.5.0) rb-kqueue (0.2.2) ffi (>= 0.5.0) + ruby_parser (3.1.3) + sexp_processor (~> 4.1) sass (3.2.19) + sexp_processor (4.4.4) sprockets (2.12.0) hike (~> 1.2) multi_json (~> 1.0) @@ -134,6 +143,7 @@ PLATFORMS DEPENDENCIES bootstrap-sass builder (~> 3.0) + html2haml middleman (~> 3.3.2) middleman-blog (~> 3.5.2) middleman-deploy -- cgit v1.2.1 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 --- _links.html.erb | 12 - _links.html.haml | 15 + source/_article.html.erb | 7 - source/_article.html.haml | 5 + source/_article_summary.html.erb | 7 - source/_article_summary.html.haml | 8 + source/_banner.html.erb | 13 - source/_banner.html.haml | 9 + source/_navigation.html.erb | 68 -- source/_navigation.html.haml | 43 ++ source/_status.html.erb | 35 - source/_status.html.haml | 23 + source/_wiki_changes.html.erb | 15 - source/_wiki_changes.html.haml | 11 + 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 + source/archiv.html.erb | 943 ----------------------- source/archiv.html.haml | 835 ++++++++++++++++++++ source/entdecken/mailinglisten.html.erb | 7 - source/entdecken/mailinglisten.html.haml | 5 + source/entdecken/raeume.html.erb | 63 -- source/entdecken/raeume.html.haml | 55 ++ source/entdecken/verein.html.erb | 73 -- source/entdecken/verein.html.haml | 62 ++ source/entdecken/wiki.html.erb | 7 - source/entdecken/wiki.html.haml | 5 + source/index.html.erb | 48 -- source/index.html.haml | 38 + source/kontakt/kontakt.html.erb | 94 --- source/kontakt/kontakt.html.haml | 92 +++ source/kontakt/lage.html.erb | 99 --- source/kontakt/lage.html.haml | 76 ++ source/layouts/layout.erb | 45 -- source/layouts/layout.haml | 25 + source/medien.html.erb | 31 - source/medien.html.haml | 35 + source/mitmachen/gruppen.html.erb | 8 - source/mitmachen/gruppen.html.haml | 6 + source/mitmachen/projekte.html.erb | 89 --- source/mitmachen/projekte.html.haml | 79 ++ source/mitmachen/regelmaessige_termine.html.erb | 37 - source/mitmachen/regelmaessige_termine.html.haml | 47 ++ source/mitmachen/termine.html.erb | 35 - source/mitmachen/termine.html.haml | 49 ++ source/mitmachen/treffen.html.erb | 8 - source/mitmachen/treffen.html.haml | 6 + source/ueber.html.erb | 35 - source/ueber.html.haml | 36 + 52 files changed, 1610 insertions(+), 1845 deletions(-) delete mode 100644 _links.html.erb create mode 100644 _links.html.haml delete mode 100644 source/_article.html.erb create mode 100644 source/_article.html.haml delete mode 100644 source/_article_summary.html.erb create mode 100644 source/_article_summary.html.haml delete mode 100644 source/_banner.html.erb create mode 100644 source/_banner.html.haml delete mode 100644 source/_navigation.html.erb create mode 100644 source/_navigation.html.haml delete mode 100644 source/_status.html.erb create mode 100644 source/_status.html.haml delete mode 100644 source/_wiki_changes.html.erb create mode 100644 source/_wiki_changes.html.haml 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 delete mode 100644 source/archiv.html.erb create mode 100644 source/archiv.html.haml delete mode 100644 source/entdecken/mailinglisten.html.erb create mode 100644 source/entdecken/mailinglisten.html.haml delete mode 100644 source/entdecken/raeume.html.erb create mode 100644 source/entdecken/raeume.html.haml delete mode 100644 source/entdecken/verein.html.erb create mode 100644 source/entdecken/verein.html.haml delete mode 100644 source/entdecken/wiki.html.erb create mode 100644 source/entdecken/wiki.html.haml delete mode 100644 source/index.html.erb create mode 100644 source/index.html.haml delete mode 100644 source/kontakt/kontakt.html.erb create mode 100644 source/kontakt/kontakt.html.haml delete mode 100644 source/kontakt/lage.html.erb create mode 100644 source/kontakt/lage.html.haml delete mode 100644 source/layouts/layout.erb create mode 100644 source/layouts/layout.haml delete mode 100644 source/medien.html.erb create mode 100644 source/medien.html.haml delete mode 100644 source/mitmachen/gruppen.html.erb create mode 100644 source/mitmachen/gruppen.html.haml delete mode 100644 source/mitmachen/projekte.html.erb create mode 100644 source/mitmachen/projekte.html.haml delete mode 100644 source/mitmachen/regelmaessige_termine.html.erb create mode 100644 source/mitmachen/regelmaessige_termine.html.haml delete mode 100644 source/mitmachen/termine.html.erb create mode 100644 source/mitmachen/termine.html.haml delete mode 100644 source/mitmachen/treffen.html.erb create mode 100644 source/mitmachen/treffen.html.haml delete mode 100644 source/ueber.html.erb create mode 100644 source/ueber.html.haml diff --git a/_links.html.erb b/_links.html.erb deleted file mode 100644 index a2c8e24..0000000 --- a/_links.html.erb +++ /dev/null @@ -1,12 +0,0 @@ - - diff --git a/_links.html.haml b/_links.html.haml new file mode 100644 index 0000000..55c9a7b --- /dev/null +++ b/_links.html.haml @@ -0,0 +1,15 @@ +#links + %h3 Friends & Family + %ul + %li + %a{:href => "http://c3le.de"} c3le + %li + %a{:href => "http://leipzig.freifunk.net"} Freifunk Leipzig + %li + %a{:href => "https://wiki.fsfe.org/groups/Leipzig"} FSFE Leipzig + %li + %a{:href => "http://hackstatt.org"} Hackstatt + %li + %a{:href => "http://sublab.org/sublounge"} sub:lounge + %li + %a{:href => "http://aboutradio.org"} about:radio diff --git a/source/_article.html.erb b/source/_article.html.erb deleted file mode 100644 index bc462f8..0000000 --- a/source/_article.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -
- -
-

<%= link_to article.title, article %>

- <%= article.body %> -
-
diff --git a/source/_article.html.haml b/source/_article.html.haml new file mode 100644 index 0000000..7194cdb --- /dev/null +++ b/source/_article.html.haml @@ -0,0 +1,5 @@ +%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/_article_summary.html.erb b/source/_article_summary.html.erb deleted file mode 100644 index 153875c..0000000 --- a/source/_article_summary.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -<% article = article_summary %> -
-

<%= link_to article.title, article %> <%= article.date.strftime('%b %e') %>

-

- <%= article_paragraphs(article).first %> <%= link_to "Mehr >>", article %> -

-
diff --git a/source/_article_summary.html.haml b/source/_article_summary.html.haml new file mode 100644 index 0000000..8654176 --- /dev/null +++ b/source/_article_summary.html.haml @@ -0,0 +1,8 @@ +- article = article_summary +%div + %h3 + = link_to article.title, article + %span= article.date.strftime('%b %e') + %p + = article_paragraphs(article).first + = link_to "Mehr >>", article diff --git a/source/_banner.html.erb b/source/_banner.html.erb deleted file mode 100644 index a260119..0000000 --- a/source/_banner.html.erb +++ /dev/null @@ -1,13 +0,0 @@ - diff --git a/source/_banner.html.haml b/source/_banner.html.haml new file mode 100644 index 0000000..a809b26 --- /dev/null +++ b/source/_banner.html.haml @@ -0,0 +1,9 @@ +#banner + %p + 22. bis 25. Mai: + %a{:href => "/cryptocon14"} CryptoCon + %p + %a{:href => "/inc/sublab_ev_mitgliedsantrag.pdf"} Mitglied werden + %p + %a{:href => "http://void.subsignal.org:9000/status.xsl"} + %b Livestream diff --git a/source/_navigation.html.erb b/source/_navigation.html.erb deleted file mode 100644 index 3a3774f..0000000 --- a/source/_navigation.html.erb +++ /dev/null @@ -1,68 +0,0 @@ -<% - - @navigation = { - - ["Aktuelles", "/aktuelles/index.html"] => [ - ["Blog", "/aktuelles/blog.html"], - ["Kalender", "/aktuelles/kalender.html"] - ], - - ["Entdecken", "/entdecken/index.html"] => [ - ["Die Räume", "/entdecken/raeume.html"], - ["Der Verein", "/entdecken/verein.html"], - ["Das Wiki", "/entdecken/wiki.html"], - ["Mailinglisten", "/entdecken/mailinglisten.html"] - ], - - ["Mitmachen!", "/mitmachen/index.html"] => [ - ["Projekte", "/mitmachen/projekte.html"], - ["Regelmässige Treffen", "/mitmachen/regelmaessige_termine.html"] - ], - - ["Unterstützen", "/unterstuetzen/index.html"] => [ - ["Mitglied werden", "/unterstuetzen/mitglied_werden.html"], - ["Förderer", "/unterstuetzen/foerderer.html"], - ["Sponsoren", "/unterstuetzen/sponsoren.html"] - ], - - ["Kontakt", "/kontakt/index.html"] => [ - ["Wegbeschreibung", "/kontakt/lage.html"], - ["Kontaktmöglichkeiten", "/kontakt/kontakt.html"] - ] - -} - -%> - -
- -
- - diff --git a/source/_navigation.html.haml b/source/_navigation.html.haml new file mode 100644 index 0000000..2a48201 --- /dev/null +++ b/source/_navigation.html.haml @@ -0,0 +1,43 @@ +- @navigation = { +- ["Aktuelles", "/aktuelles/index.html"] => [ +- ["Blog", "/aktuelles/blog.html"], +- ["Kalender", "/aktuelles/kalender.html"] +- ], +- ["Entdecken", "/entdecken/index.html"] => [ +- ["Die Räume", "/entdecken/raeume.html"], +- ["Der Verein", "/entdecken/verein.html"], +- ["Das Wiki", "/entdecken/wiki.html"], +- ["Mailinglisten", "/entdecken/mailinglisten.html"] +- ], +- ["Mitmachen!", "/mitmachen/index.html"] => [ +- ["Projekte", "/mitmachen/projekte.html"], +- ["Regelmässige Treffen", "/mitmachen/regelmaessige_termine.html"] +- ], +- ["Unterstützen", "/unterstuetzen/index.html"] => [ +- ["Mitglied werden", "/unterstuetzen/mitglied_werden.html"], +- ["Förderer", "/unterstuetzen/foerderer.html"], +- ["Sponsoren", "/unterstuetzen/sponsoren.html"] +- ], +- ["Kontakt", "/kontakt/index.html"] => [ +- ["Wegbeschreibung", "/kontakt/lage.html"], +- ["Kontaktmöglichkeiten", "/kontakt/kontakt.html"] +- ] +- } +.navbar-header + %button.navbar-toggle{"data-target" => "#nav-big", "data-toggle" => "collapse", :type => "button"} + %span.sr-only Toggle navigation + %span.icon-bar + %span.icon-bar + %span.icon-bar +#nav-big.collapse.navbar-collapse + %ul + - @navigation.each do |key, value| + %li.dropdown + + \#{key.first} + - if value + %b.caret + - if value + %ul.dropdown-menu + - value.each do |name, url| + %li= link_to(name, url) diff --git a/source/_status.html.erb b/source/_status.html.erb deleted file mode 100644 index d291f62..0000000 --- a/source/_status.html.erb +++ /dev/null @@ -1,35 +0,0 @@ - diff --git a/source/_status.html.haml b/source/_status.html.haml new file mode 100644 index 0000000..536a7ae --- /dev/null +++ b/source/_status.html.haml @@ -0,0 +1,23 @@ +#status + %table + %tbody + %tr + %td sublab: + %td.status-sublab Offen + %tr + %td Taifun: + %td Online + %tr + %td Trieste: + %td Online + %hr/ + %p + %a.img{:href => "/webcam"} + %img.webcamthumb{:alt => "Webcam im Fenster", :src => "/img/thumb.street.webcam.jpg"}/ + %hr/ + %p + %a.img{:href => "/img/tempgraph.png"} + %img.webcamthumb{:alt => "Temperaturen im sublab", :src => "/img/tempgraph.png", :width => "240"}/ + %p.subtext + Temperatur im sublab + / diff --git a/source/_wiki_changes.html.erb b/source/_wiki_changes.html.erb deleted file mode 100644 index a691bfb..0000000 --- a/source/_wiki_changes.html.erb +++ /dev/null @@ -1,15 +0,0 @@ -