Merge remote-tracking branch 'origin/master'

* origin/master:
  tobib_services-hover.diff patch
  added some dummy content for services
  fixed typo, removed hover effect and added .pyc-files to gitignore

Conflicts:
	index.html
	static/css/main.css
	static/css/reset.css
	utils/filters.pyc

14 files changed, 138 insertions, 15 deletions

diff --git a/.gitignore b/.gitignore
index e35d885..4930881 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+*.pyc
 _build
diff --git a/services/dev.html b/services/dev.html
index 25bb838..a969097 100644
--- a/services/dev.html
+++ b/services/dev.html
@@ -6,5 +6,16 @@
 {% endmeta %}
 
 {% block content %}
-That's just a simple page nax
+<h2><a href="#">dev.spline.de</a></h2>
+<h3>Daten</h3>
+<ul>
+  <li>online seit 2000</li>
+  <li>Benutzer: 1337</li>
+  <li>Repositories: 7331</li>
+</ul>
+
+<h3>Beschreibung</h3>
+<p>
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+</p>
 {% endblock %}
diff --git a/services/foren.html b/services/foren.html
index 31169d3..8cd661e 100644
--- a/services/foren.html
+++ b/services/foren.html
@@ -5,5 +5,17 @@
 {% endmeta %}
 
 {% block content %}
-That's just a simple page nax
+<h2><a href="#">foren.spline.de</a></h2>
+<h3>Daten</h3>
+<ul>
+  <li>online seit 2000</li>
+  <li>Benutzer: 1337</li>
+  <li>Posts: 7331</li>
+  <li>Topics: 7331</li>
+</ul>
+
+<h3>Beschreibung</h3>
+<p>
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+</p>
 {% endblock %}
diff --git a/services/ftp.html b/services/ftp.html
index b81b5f7..b1f4dc5 100644
--- a/services/ftp.html
+++ b/services/ftp.html
@@ -5,5 +5,16 @@
 {% endmeta %}
 
 {% block content %}
-That's just a simple page nax
+<h2><a href="#">ftp.spline.de</a></h2>
+<h3>Daten</h3>
+<ul>
+  <li>online seit 2000</li>
+  <li>Traffic: 9999 GB</li>
+  <li>Size: 7331</li>
+</ul>
+
+<h3>Beschreibung</h3>
+<p>
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+</p>
 {% endblock %}
diff --git a/services/gedaechtnisprotokolle.html b/services/gedaechtnisprotokolle.html
index aa60cdc..ae3657f 100644
--- a/services/gedaechtnisprotokolle.html
+++ b/services/gedaechtnisprotokolle.html
@@ -5,5 +5,15 @@
 {% endmeta %}
 
 {% block content %}
-That's just a simple page nax
+<h2><a href="#">gprot.spline.de</a></h2>
+<h3>Daten</h3>
+<ul>
+  <li>online seit 2000</li>
+  <li>Protokolle: 99</li>
+</ul>
+
+<h3>Beschreibung</h3>
+<p>
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+</p>
 {% endblock %}
diff --git a/services/jabber.html b/services/jabber.html
index 063ff37..424bdfd 100644
--- a/services/jabber.html
+++ b/services/jabber.html
@@ -5,5 +5,15 @@
 {% endmeta %}
 
 {% block content %}
-That's just a simple page nax
+<h2><a href="#">jabber.spline.de</a></h2>
+<h3>Daten</h3>
+<ul>
+  <li>online seit 2000</li>
+  <li>User: 99</li>
+</ul>
+
+<h3>Beschreibung</h3>
+<p>
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+</p>
 {% endblock %}
diff --git a/services/lists.html b/services/lists.html
index aa7bb9e..a6b0c60 100644
--- a/services/lists.html
+++ b/services/lists.html
@@ -5,5 +5,16 @@
 {% endmeta %}
 
 {% block content %}
-That's just a simple page nax
+<h2><a href="#">lists.spline.de</a></h2>
+<h3>Daten</h3>
+<ul>
+  <li>online seit 2000</li>
+  <li>User: 99</li>
+  <li>Mailinglisten: 9999</li>
+</ul>
+
+<h3>Beschreibung</h3>
+<p>
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+</p>
 {% endblock %}
diff --git a/services/osm.html b/services/osm.html
index 9913194..10324d8 100644
--- a/services/osm.html
+++ b/services/osm.html
@@ -5,5 +5,14 @@
 {% endmeta %}
 
 {% block content %}
-That's just a simple page nax
+<h2><a href="#">osm.spline.de</a></h2>
+<h3>Daten</h3>
+<ul>
+  <li>online seit 2000</li>
+</ul>
+
+<h3>Beschreibung</h3>
+<p>
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+</p>
 {% endblock %}
diff --git a/services/pad.html b/services/pad.html
index 3bab8c4..67ebd34 100644
--- a/services/pad.html
+++ b/services/pad.html
@@ -5,5 +5,15 @@
 {% endmeta %}
 
 {% block content %}
-That's just a simple page nax
+<h2><a href="#">pad.spline.de</a></h2>
+<h3>Daten</h3>
+<ul>
+  <li>online seit 2000</li>
+  <li>Pads: 999</li>
+</ul>
+
+<h3>Beschreibung</h3>
+<p>
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+</p>
 {% endblock %}
diff --git a/services/spit.html b/services/spit.html
index 10bd337..8f18688 100644
--- a/services/spit.html
+++ b/services/spit.html
@@ -4,8 +4,17 @@
   description: freie git Hostingmöglichkeit
 {% endmeta %}
 
-{% block title %}archive of {{ year }} year{% endblock %}
-
 {% block content %}
-That's just a simple page nax
+<h2><a href="#">spit.spline.de</a></h2>
+<h3>Daten</h3>
+<ul>
+  <li>online seit 2000</li>
+  <li>Repositores: 999</li>
+  <li>User: 999</li>
+</ul>
+
+<h3>Beschreibung</h3>
+<p>
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+</p>
 {% endblock %}
diff --git a/services/splinux.html b/services/splinux.html
index bd7829f..84cc10e 100644
--- a/services/splinux.html
+++ b/services/splinux.html
@@ -5,5 +5,14 @@
 {% endmeta %}
 
 {% block content %}
-That's just a simple page nax
+<h2>Spline Linux User-Group</h2>
+<h3>Daten</h3>
+<ul>
+  <li>existiert seit 2000</li>
+</ul>
+
+<h3>Beschreibung</h3>
+<p>
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+</p>
 {% endblock %}
diff --git a/services/talks.html b/services/talks.html
index 59511a1..66edf99 100644
--- a/services/talks.html
+++ b/services/talks.html
@@ -5,5 +5,15 @@
 {% endmeta %}
 
 {% block content %}
-That's just a simple page nax
+<h2><a href="#">talks.spline.de</a></h2>
+<h3>Daten</h3>
+<ul>
+  <li>online seit 2000</li>
+  <li>Talks: 21</li>
+</ul>
+
+<h3>Beschreibung</h3>
+<p>
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+</p>
 {% endblock %}
diff --git a/services/zettel.html b/services/zettel.html
index a19781e..dbac082 100644
--- a/services/zettel.html
+++ b/services/zettel.html
@@ -5,6 +5,16 @@
 {% endmeta %}
 
 {% block content %}
-That's just a simple page nax
-{% endblock %}
+<h2><a href="#">zettel.spline.de</a></h2>
+<h3>Daten</h3>
+<ul>
+  <li>online seit 2000</li>
+  <li>Benutzer: 999</li>
+  <li>verschickte Zettel: 99999</li>
+</ul>
 
+<h3>Beschreibung</h3>
+<p>
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+</p>
+{% endblock %}
diff --git a/utils/filters.pyc b/utils/filters.pyc
deleted file mode 100644
index 7996174..0000000
--- a/utils/filters.pyc
+++ /dev/null