8 files changed, 79 insertions, 3 deletions
diff --git a/css/ffgraz.css b/css/ffgraz.css
index 15b0aee..c0be535 100644
--- a/css/ffgraz.css
+++ b/css/ffgraz.css
@@ -60,6 +60,7 @@ div#links ul#lang li {
   padding: 0.15em 0.15em;
   margin: 0;
   border: 0;
+  font-size: 9pt;
 }
 div#links ul#lang li:first-child {
   padding-left: 1.5em;
@@ -166,7 +167,7 @@ div#meetup {
   background-color: #322F33;
   padding: 0.25em 2em;
   font-size: 0.9em;
-  width: 20em;
+  width: 25em;
 }
 div#meetup p {
   padding: 0;
diff --git a/inc/de/links.html b/inc/de/links.shtml
index 175e30c..728b715 100644
--- a/inc/de/links.html
+++ b/inc/de/links.shtml
@@ -6,5 +6,6 @@
      <li><a href="links.html">Links</a></li>
      <li><a href="contact.html">Kontakt / Impressum</a></li>
    </ul>
+<!--#include virtual="/inc/lang.shtml" -->
    <div style="clear: both"></div>
  </div>
diff --git a/inc/en/links.shtml b/inc/en/links.shtml
new file mode 100644
index 0000000..24fedc2
--- /dev/null
+++ b/inc/en/links.shtml
@@ -0,0 +1,11 @@
+ <div id="links">
+   <ul>
+     <li><a href="index.html">Home</a></li>
+     <li><a href="http://wiki.ffgraz.net">Wiki</a></li>
+     <li><a href="others.html">Related Initiatives</a></li>
+     <li><a href="links.html">Links</a></li>
+     <li><a href="contact.html">Contact / Legal Notice</a></li>
+   </ul>
+<!--#include virtual="/inc/lang.shtml" -->
+   <div style="clear: both"></div>
+ </div>
diff --git a/inc/en/meetup.shtml b/inc/en/meetup.shtml
new file mode 100644
index 0000000..af8de0f
--- /dev/null
+++ b/inc/en/meetup.shtml
@@ -0,0 +1,13 @@
+<div id="meetup">
+<h1>Next Meet-Up</h1>
+<p>
+  Monday, <em><!--#include virtual="/meetup/next.html" --></em> at <em>8 pm</em><br />
+  at <a href="http://realraum.at/wiki/doku.php">realraum</a>,
+  <a href="http://maps.google.com/maps?f=q&amp;source=s_q&amp;hl=en&amp;geocode=&amp;q=jakoministrasse+16+,+graz,+austria&amp;sll=37.857507,-95.712891&amp;sspn=29.754559,64.160156&amp;ie=UTF8&amp;ll=47.066395,15.442164&amp;spn=0.00315,0.007832&amp;z=17"> Jakoministrasse 16</a><br /><br />
+  Next planned meet-ups will be on:
+</p>
+<!--#include virtual="/meetup/after.html" -->
+<p>
+  Further Information can be found at our <a href="http://wiki.graz.funkfeuer.at/Treffen">Wiki</a>.
+</p>
+</div>
diff --git a/inc/en/navigation.html b/inc/en/navigation.html
new file mode 100644
index 0000000..2768b7d
--- /dev/null
+++ b/inc/en/navigation.html
@@ -0,0 +1,35 @@
+ <div id="navigation">
+   <h1>for Newbies</h1>
+   <ul>
+     <li><a href="about.html">About Funkfeuer</a></li>
+     <li><a href="http://wiki.ffgraz.net/FAQ">FAQ</a></li>
+     <li><a href="http://wiki.ffgraz.net/ErsteSchritte">Join Us: First Steps</a></li>
+   </ul>
+
+   <h1>for Nodeowners</h1>
+   <ul>
+      <li><a href="http://wiki.ffgraz.net">Wiki: Start</a></li>
+      <li><a href="http://wiki.ffgraz.net/RouterKonfiguration">Wiki: router configuration</a></li>
+      <li><a href="http://wiki.ffgraz.net/Netzwerkoptimierung">PIMP your node - Tuning</a></li>
+      <li><a href="services.html">Services</a></li>
+      <li><a href="mailinglisten.html">Mailinglists</a></li>
+      <li><a href="http://manman.ffgraz.net">Database</a></li>
+      <li><a href="http://gallery.funkfeuer.at/v/Graz/">Gallery</a></li>
+   </ul>
+
+   <h1>the Network</h1>
+   <ul>
+      <li><a href="http://stats.ffgraz.net">Statistics</a></li>
+      <li><a href="http://karte.ffgraz.net">Map</a></li>
+      <li><a href="http://stats.ffgraz.net/topo/topology.png">Topology</a></li>
+      <li><a href="http://stats.ffgraz.net/smokeping/?target=Funkfeuer">SmokePing</a></li>
+      <li><a href="http://stats.ffgraz.net/version/ff_version.png">Firmware Versions</a></li>
+   </ul>
+
+   <h1>further Informationen</h1>
+   <ul>
+      <li><a href="history.html">History</a></li>
+      <li><a href="film.html">Film</a></li>
+      <li><a href="http://wiki.ffgraz.net/Verein">the Club</a></li>
+   </ul>
+ </div>
diff --git a/inc/lang.shtml b/inc/lang.shtml
new file mode 100644
index 0000000..a5dfe67
--- /dev/null
+++ b/inc/lang.shtml
@@ -0,0 +1,15 @@
+<!--#set var="sitehtml" value="${SITE}.html" -->
+   <ul id="lang">
+<!--#if expr="${LANG} == de" -->
+     <li><img src="/images/at_dis.png" /><img src="/images/de_dis.png" /></li>
+<!--#else -->
+     <li><a href="/de/<!--#echo var="sitehtml" -->"><img src="/images/at.png" /><img src="/images/de.png" /></a></li>
+<!--#endif-->
+
+<!--#if expr="${LANG} == en" -->
+     <li><img src="/images/uk_dis.png" /><img src="/images/us_dis.png" /></li>
+<!--#else -->
+     <li><a href="/en/<!--#echo var="sitehtml" -->"><img src="/images/uk.png" /><img src="/images/us.png" /></a></li>
+<!--#endif-->
+   </ul>
+
diff --git a/index.shtml b/index.shtml
index c6e472b..0014c33 100644
--- a/index.shtml
+++ b/index.shtml
@@ -1,5 +1,5 @@
 <!--#include virtual="/inc/header.html" --> 
-<!--#include virtual="/inc/${LANG}/links.html" --> 
+<!--#include virtual="/inc/${LANG}/links.shtml" --> 
 <!--#include virtual="/inc/${LANG}/navigation.html" --> 
      <div id="content">
 <!--#if expr="${SITE} == index" -->
diff --git a/template/index.html b/template/index.html
index 942df9b..df05030 100644
--- a/template/index.html
+++ b/template/index.html
@@ -16,7 +16,7 @@
      <li><a href="/">Kontakt / Impressum</a></li>
    </ul>
    <ul id="lang">
-     <li><a href="/"><img src="/images/at_dis.png" /><img src="/images/de_dis.png" /></a></li>
+     <li><img src="/images/at_dis.png" /><img src="/images/de_dis.png" /></li>
      <li><a href="/"><img src="/images/uk.png" /><img src="/images/us.png" /></a></li>
    </ul>
    <div style="clear: both"></div>