diff --git a/static/style.css b/static/style.css
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/templates/base.html b/templates/base.html
index 74af4175b7c5660783d4a2bd106769e0d942dccd..fcafeeb3066d1eedfe546195929cad3607683c40 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -16,8 +16,9 @@
</head>
<body>
{%include "header.html" %}
+ {% block content %}
<h1>This is a Heading</h1>
<p>This is a paragraph.</p>
-
+ {% endblock %}
</body>
</html>
diff --git a/templates/header.html b/templates/header.html
index 784e9568646bd5822e89fea63ede34264f0429f0..bcdbd2588aed26170ff23ad1e0926c961e18a503 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -7,6 +7,7 @@
<div class="col-md-11">
<div class="row" style="">
<ul class="list-inline col-xs-12">
+ <!---
<li>
<a href="#">Vampir</a>
</li>
@@ -22,19 +23,20 @@
<li>
<a href="#">Twitter</a>
</li>
+ !--->
</ul>
</div>
<div class="row">
<div class="col-md-7">
<ul class="nav nav-pills">
- <li>
- <a href="#"><span class="glyphicon glyphicon-home"></span> Home</a>
+ <li class="active">
+ <a href="/"><span class="glyphicon glyphicon-home"></span> Home</a>
</li>
<li>
- <a href="#"><span class="glyphicon glyphicon-film"></span> Videos</a>
+ <a href="/videos"><span class="glyphicon glyphicon-film"></span> Videos</a>
</li>
<li>
- <a href="#">Mitmachen</a>
+ <a href="/contribute">Mitmachen</a>
</li>
</ul>
</div>
@@ -45,6 +47,25 @@
<span class=""><button class="btn btn-default" type="submit">Submit</button>
</div>
</div>
+ <div class="row">
+ <div class="col-md-12">
+ <ul class="nav nav-pills">
+ <!--
+ <li>
+ <a href="#">Streams</a>
+ </li>
+ <li>
+ <a href="#">Statistiken</a>
+ </li>
+ <li>
+ <a href="#">Mitmachen</a>
+ </li>
+ !--->
+ </ul>
+ </div>
+ </div>
+
+
</div>
</div>
</div>
diff --git a/templates/index.html b/templates/index.html
index 94d9808cc760156cb7ab46e326c0267f3406125e..9b98230f5f3460c027c3a5e10ce1cb117da03f17 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1 +1,77 @@
{% extends "base.html" %}
+{% block content %}
+<div class="container-fluid">
+ <div class="row">
+ <div class="col-md-6">
+ <div>
+ <h1>Video AG</h1>
+ <p>Wir machen Vorlesungsvideos, damit du dir deine Vorlesungen angucken kannst, wann, wo und so oft <strong>du</strong> willst ;)</p>
+ <p><strong>Probleme?</strong><a href="http://google.de"> Hier gehts zur FAQ</a></p>
+ <p>Wenn du die Videos nützlich fandest, schreib doch bitte den Dozenten eine kurze E-Mail. Waren die Videos grauenhaft? Kritik an uns.</p>
+ <p>Wenn du mitmachen willst, Fragen oder Anregungen hast, oder nur mal schauen möchtest, komm zu unserem AG-Treffen oder schreib uns eine E-Mail.
+ Insbesondere freuen wir uns über Studis der Mathematik und Physik, die ihre Vorlesungen filmen wollen.
+ Die nächste Sitzung der AG findet am 10.08.2016 ab 18:00 Uhr in den Räumlichkeiten der Fachschaft im Augustinerbach 2a, 1. Obergeschoss statt.
+ </p>
+ </div>
+ <div>
+ <h1>Featured</h1>
+ <h3>Collegium Musicum</h3>
+ <img style="width:100%" src="http://www.cm.rwth-aachen.de/typo3/typo3temp/pics/c1d685f56a.jpg">
+ </div>
+ </div>
+ <div class="col-md-6">
+ <h1>Neueste Videos</h1>
+ <ul class="list-group">
+ <li class="list-group-item">
+ <div class="row">
+ <a href="?view=player&lectureid=7359#content" title="HYP2016">
+ <img class="col-xs-4" src="https://video.fsmpi.rwth-aachen.de/pub/thumbnails/16ss-hyp-160802-720p.jpg" alt="Vorschaubild">
+ <div class="col-xs-4">
+ <span title="HYP2016">HYP2016</span>
+ <span title="02.08.16 18:00">02.08.16</span>
+ <p>The classical limit of quantum observables in conservation laws of fluid dynamics</p>
+ </div>
+ <div class="col-xs-4">
+ <div class="comment">Quantum mechanics II</div>
+ <div class="comment">Gehalten von Anders Szepessy</div>
+ </div>
+ </a>
+ </div>
+ </li>
+ <li class="list-group-item">
+ <div class="row">
+ <a href="?view=player&lectureid=7359#content" title="HYP2016">
+ <img class="col-xs-4" src="https://video.fsmpi.rwth-aachen.de/pub/thumbnails/16ss-hyp-160802-720p.jpg" alt="Vorschaubild">
+ <div class="col-xs-4">
+ <span title="HYP2016">HYP2016</span>
+ <span title="02.08.16 18:00">02.08.16</span>
+ <p>The classical limit of quantum observables in conservation laws of fluid dynamics</p>
+ </div>
+ <div class="col-xs-4">
+ <div class="comment">Quantum mechanics II</div>
+ <div class="comment">Gehalten von Anders Szepessy</div>
+ </div>
+ </a>
+ </div>
+ </li>
+ <li class="list-group-item">
+ <div class="row">
+ <a href="?view=player&lectureid=7359#content" title="HYP2016">
+ <img class="col-xs-4" src="https://video.fsmpi.rwth-aachen.de/pub/thumbnails/16ss-hyp-160802-720p.jpg" alt="Vorschaubild">
+ <div class="col-xs-4">
+ <span title="HYP2016">HYP2016</span>
+ <span title="02.08.16 18:00">02.08.16</span>
+ <p>The classical limit of quantum observables in conservation laws of fluid dynamics</p>
+ </div>
+ <div class="col-xs-4">
+ <div class="comment">Quantum mechanics II</div>
+ <div class="comment">Gehalten von Anders Szepessy</div>
+ </div>
+ </a>
+ </div>
+ </li>
+ </ul>
+ </div>
+ </div>
+</div>
+{% endblock %}