diff --git a/templates/base.html b/templates/base.html
index e45f5ab689158a5981d5153add94869c652507c9..6c1e6ad471a85797ead38ded8d87d08f4394df7d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,3 +1,10 @@
+{% set navigation_bar = [
+('/', 'index', 'Home', 'home'),
+('/videos', 'videos', 'Videos', 'film'),
+('/faq', 'faq', 'FAQ', 'question-sign')
+] -%}
+{% set active_page = active_page|default('index') -%}
+
<!DOCTYPE html>
<html>
<head>
@@ -12,11 +19,72 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="static/bootstrap/bootstrap.css" rel="stylesheet">
<script src="static/bootstrap/bootstrap.js"></script>
-
</head>
<body>
- {%include "header.html" %}
- {% set active_page = active_page %}
+ <nav class="navbar navbar-default navbar-static-top">
+ <div class="container-fluid">
+ <div class="row">
+ <div class="col-xs-1">
+ <a href="#"><img src="/static/logo.png" style="width: 80px; padding: 5px"></a>
+ </div>
+ <div class="col-md-11">
+ <div class="row" style="">
+ <ul class="list-inline col-xs-12">
+ <li>
+ <a href="#">Vampir</a>
+ </li>
+ <li>
+ <a href="#">Youtube</a>
+ </li>
+ <li>
+ <a href="#">Fachschaft</a>
+ </li>
+ <li>
+ <a href="#">Facebook</a>
+ </li>
+ <li>
+ <a href="#">Twitter</a>
+ </li>
+ </ul>
+ </div>
+ <div class="row">
+ <div class="col-md-6">
+ <ul class="nav nav-pills">
+ {% for href, id, caption, gly in navigation_bar %}
+ <li{% if id == active_page %} class="active"{% endif %}>
+ <a href="{{ href|e }}">{% if gly != '' %}<span class="glyphicon glyphicon-{{ gly }}"></span> {% endif %}{{ caption }}</a>
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
+ <div class="col-xs-5">
+ <span class=""><input class="form-control" type="text" placeholder="Search">
+ </div>
+ <div class="col-md-1">
+ <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>
+ </nav>
{% block content %}
<h1>This is a Heading</h1>
<p>This is a paragraph.</p>
diff --git a/templates/header.html b/templates/header.html
deleted file mode 100644
index 29b8744234c5284b355336087ce8fc2f7bfff4dc..0000000000000000000000000000000000000000
--- a/templates/header.html
+++ /dev/null
@@ -1,72 +0,0 @@
-{% set navigation_bar = [
-('/', 'index', 'Home', 'home'),
-('/videos', 'videos', 'Videos', 'film'),
-('/faq', 'faq', 'FAQ', 'question-sign')
-] -%}
-{% set active_page = active_page|default('index') -%}
-<nav class="navbar navbar-default navbar-static-top">
- <div class="container-fluid">
- <div class="row">
- <div class="col-xs-1">
- <a href="#"><img src="/static/logo.png" style="width: 80px; padding: 5px"></a>
- </div>
- <div class="col-md-11">
- <div class="row" style="">
- <ul class="list-inline col-xs-12">
- <li>
- <a href="#">Vampir</a>
- </li>
- <li>
- <a href="#">Youtube</a>
- </li>
- <li>
- <a href="#">Fachschaft</a>
- </li>
- <li>
- <a href="#">Facebook</a>
- </li>
- <li>
- <a href="#">Twitter</a>
- </li>
- </ul>
- </div>
- <div class="row">
- <div class="col-md-6">
- <ul class="nav nav-pills">
- {% for href, id, caption, gly in navigation_bar %}
- <li{% if id == active_page %} class="active"{% endif %}>
- <a href="{{ href|e }}">{% if gly != '' %}<span class="glyphicon glyphicon-{{ gly }}"></span> {% endif %}{{ caption }}</a>
- </li>
- {% endfor %}
- </ul>
- </div>
- <div class="col-xs-5">
- <span class=""><input class="form-control" type="text" placeholder="Search">
- </div>
- <div class="col-md-1">
- <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>
-</nav>