1 files changed, 37 insertions, 43 deletions
diff --git a/templates/layout.html b/templates/layout.html
index 936f5660..af412184 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -1,46 +1,40 @@
 <!DOCTYPE html>
 <html>
-    <head>
-        <title>%title% - Engelsystem</title>
-        <meta charset="UTF-8" />
-        <meta http-equiv="content-type" content="text/html;charset=utf-8" />
-        <meta name="content-style-type" content="text/css" />
-        <meta name="keywords" content="Engel, Himmelsverwaltung" />
-        <meta http-equiv="Content-Style-Type" content="text/css" />
-        <meta http-equiv="expires" content="0" />
-        <meta name="robots" content="index" />
-        <meta name="revisit-after" content="1 days" />
-        <script type="text/javascript" src="css/forms.js"></script>
-        <link rel="stylesheet" type="text/css" href="css/base.css" />
-        <link rel="stylesheet" type="text/css" href="css/style%theme%.css" />
-        %atom_link%
-    </head>
-    <body class="background">
-        <header>
-            <a href="?" id="logo"></a>
-            %header_toolbar%
-            <div class="clear"></div>
-        </header>
-        <div id="body">
-            <div id="menu">
-                %menu%
-                <nav class="container small">
-                    <ul>
-                        <li><a href="%faq_url%">FAQ</a></li>
-                        <li><a href="mailto:erzengel@lists.ccc.de">Contact <img src="pic/icons/email.png" alt="E-Mail"></a></li>
-                        <li><a href="mailto:bugs@engelsystem.de">Bugs / Features <img src="pic/icons/email.png" alt="E-Mail"></a></li>
-                        <li><a href="https://vcs.wybt.net/engelsystem/trac/">Development Platform</a></li>
-                        <li><a href="?p=credits">Credits</a></li>
-                    </ul>
-                </nav>
-            </div>
-            <div id="content" class="container">
-                <h1>%title%</h1>
-                <article class="content">
-                    %content%
-                </article>
-            </div>
-            <div class="clear"></div>
-        </div>
-    </body>
+<head>
+<title>%title% - Engelsystem</title>
+<meta charset="UTF-8" />
+<meta http-equiv="content-type" content="text/html;charset=utf-8" />
+<meta name="content-style-type" content="text/css" />
+<meta name="keywords" content="Engel, Himmelsverwaltung" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="expires" content="0" />
+<meta name="robots" content="index" />
+<meta name="revisit-after" content="1 days" />
+<script type="text/javascript" src="vendor/jquery-2.1.1.min.js"></script>
+<script type="text/javascript" src="vendor/bootstrap-3.2.0/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="css/forms.js"></script>
+<link rel="stylesheet" type="text/css" href="vendor/bootstrap-3.2.0/css/theme%theme%.css" />
+<link rel="stylesheet" type="text/css" href="vendor/icomoon/style.css" />
+%atom_link%
+</head>
+<body>
+  <div class="navbar navbar-default navbar-fixed-top">
+    <div class="container-fluid">
+      <a class="navbar-brand" href="?"><span class="icon-icon_angel"></span> <strong>ENGELSYSTEM</strong></a> %header_toolbar%
+    </div>
+  </div>
+  <div class="container-fluid">
+    <div class="col-md-2" style="margin-top: 28px;">
+      %menu%
+      <ul>
+        <li><a href="%faq_url%">FAQ</a></li>
+        <li><a href="mailto:erzengel@lists.ccc.de">Contact <img src="pic/icons/email.png" alt="E-Mail"></a></li>
+        <li><a href="mailto:bugs@engelsystem.de">Bugs / Features <img src="pic/icons/email.png" alt="E-Mail"></a></li>
+        <li><a href="https://vcs.wybt.net/engelsystem/trac/">Development Platform</a></li>
+        <li><a href="?p=credits">Credits</a></li>
+      </ul>
+    </div>
+    %content%
+  </div>
+</body>
 </html>