diff options
| author | Lars Henrik Mai <lars.mai@kontinui.de> | 2014-10-25 17:33:47 +0200 |
|---|---|---|
| committer | Lars Henrik Mai <lars.mai@kontinui.de> | 2014-10-25 17:33:47 +0200 |
| commit | a1e8c6fc94297741b1ee00e821b3bf9d4d51e189 (patch) | |
| tree | a9db9acb39726ed52d2f904dfbc2de56b18655c9 /source | |
| parent | 90c0d3659850d71119a2825cfedc85f18e9c768f (diff) | |
use data for tweets and wiki changes
Diffstat (limited to 'source')
| -rw-r--r-- | source/_article.html.haml | 2 | ||||
| -rw-r--r-- | source/_wiki_changes.html.haml | 11 | ||||
| -rw-r--r-- | source/index.html.haml | 30 |
3 files changed, 19 insertions, 24 deletions
diff --git a/source/_article.html.haml b/source/_article.html.haml index a276a81..fde602e 100644 --- a/source/_article.html.haml +++ b/source/_article.html.haml @@ -1,7 +1,7 @@ .row .column %article - %aside.blog-date= article.date.strftime('%e %b %Y') + %aside.blog-date= article.date.strftime(CalendarHelpers::FORMATS[:date_string_short]) .blog-inner %h3.blog-article-heading= link_to article.title, article = article.body diff --git a/source/_wiki_changes.html.haml b/source/_wiki_changes.html.haml deleted file mode 100644 index e1e8d6e..0000000 --- a/source/_wiki_changes.html.haml +++ /dev/null @@ -1,11 +0,0 @@ -%ul - - wiki_changes.each do |item| - %li - = item.datetime.strftime("%Y-%m-%d %H:%M") - | - \#{link_to_wiki(item.page)} - changed by - \#{link_to_wiki(item.username)} - - if item.changelog - | - \#{item.changelog} diff --git a/source/index.html.haml b/source/index.html.haml index 0bba68b..947653e 100644 --- a/source/index.html.haml +++ b/source/index.html.haml @@ -37,18 +37,24 @@ title: sublab - Ein Hackerspace in Leipzig .row .columns %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 - + - data.tweets.map {|atts| Tweet.new(atts) }.each do |tweet| + %p + %strong= tweet.user_name + = tweet.user_screen_name + = tweet.created_at + %br + = tweet.text .row .columns %h3 Wiki Aktivität - = partial "wiki_changes" + %ul + - wiki_changes.each do |item| + %li + = item.datetime + | + = link_to_wiki(item.page) + changed by + = link_to_wiki(item.username) + - if item.changelog + | + = item.changelog |