diff options
| author | Lars Henrik Mai <lars.mai@kontinui.de> | 2014-05-06 19:19:42 +0200 |
|---|---|---|
| committer | Lars Henrik Mai <lars.mai@kontinui.de> | 2014-05-06 19:19:42 +0200 |
| commit | 4f710e6bfd772e0c6eca207ece4e030c2db482ae (patch) | |
| tree | 2077aef045eb6e3a15a3110da41305efdd7682a6 | |
| parent | 7eceb7abcc2a213ee192409cfa526066a0a9c89b (diff) | |
move aggregated news to front
| -rw-r--r-- | _links.html.erb | 12 | ||||
| -rw-r--r-- | source/index.html.erb | 39 |
2 files changed, 40 insertions, 11 deletions
diff --git a/_links.html.erb b/_links.html.erb new file mode 100644 index 0000000..a2c8e24 --- /dev/null +++ b/_links.html.erb @@ -0,0 +1,12 @@ +<div id="links"> + <h3>Friends & Family</h3> + <ul> + <li><a href="http://c3le.de">c3le</a></li> + <li><a href="http://leipzig.freifunk.net">Freifunk Leipzig</a></li> + <li><a href="https://wiki.fsfe.org/groups/Leipzig">FSFE Leipzig</a></li> + <li><a href="http://hackstatt.org">Hackstatt</a></li> + <li><a href="http://sublab.org/sublounge">sub:lounge</a></li> + <li><a href="http://aboutradio.org">about:radio</a></li> + </ul> +</div> + diff --git a/source/index.html.erb b/source/index.html.erb index 480471a..5bae1cd 100644 --- a/source/index.html.erb +++ b/source/index.html.erb @@ -3,7 +3,7 @@ title: sublab - Ein Hackerspace in Leipzig --- <div> - <h2>Das sublab - Ein Hackerspace in Leipzig</h2> + <h2>Ein Hackerspace in Leipzig</h2> <p> Das sublab ist ein <a href="/wiki/Hackerspace">Hackerspace</a>. Es bietet technik- und netzaffinen Menschen aus Leipzig und Umgebung, sowie der @@ -12,16 +12,33 @@ title: sublab - Ein Hackerspace in Leipzig </div> -<div id="links"> - <h3>[Friends & Family]</h3> - <ul> - <li><a href="http://c3le.de">c3le</a></li> - <li><a href="http://leipzig.freifunk.net">Freifunk Leipzig</a></li> - <li><a href="https://wiki.fsfe.org/groups/Leipzig">FSFE Leipzig</a></li> - <li><a href="http://hackstatt.org">Hackstatt</a></li> - <li><a href="http://sublab.org/sublounge">sub:lounge</a></li> - <li><a href="http://aboutradio.org">about:radio</a></li> - </ul> +<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> |