1 files changed, 26 insertions, 23 deletions
diff --git a/rpkid/rpki/gui/app/templates/base.html b/rpkid/rpki/gui/app/templates/base.html
index ac8abd17..0af1d241 100644
--- a/rpkid/rpki/gui/app/templates/base.html
+++ b/rpkid/rpki/gui/app/templates/base.html
@@ -1,44 +1,47 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-   "http://www.w3.org/TR/html4/strict.dtd">
-<html>
+<!DOCTYPE HTML>
+<html lang="en">
   <head>
     <meta name='Content-Type' content='text/html; charset=UTF-8'>
     <title>{% block title %}RPKI{% endblock %}</title>
     {% block head %}{% endblock %}
-    <link rel="stylesheet" href="/site_media/css/bootstrap.min.css">
+    <link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap.min.css" media="screen">
     <style type="text/css">
-      body { padding-top: 50px; }
-      {% block css %}{% endblock %}
+      body { padding: 40px }
     </style>
   </head>
   <body>
-    <!-- TOP BAR -->
-    <div class="topbar">
-      <div class="topbar-inner">
-	<div class="container">
-	  <h3><a href="#">rpki.net</a></h3>
 
-	  {% if user.is_authenticated %}
+    <!-- TOP BAR -->
+    <div class="container">
+      <div class="navbar navbar-inverse navbar-fixed-top">
+	<div class="navbar-inner">
+	  <a class="brand" href="#">rpki.net</a>
 	  <ul class='nav'>
-	    <li><p>Logged in as {{ user }}</li>
+	    <li class="active">
+	      <a href="#">Home</a>
+	    </li>
+	    <li class="divider-vertical"></li>
+	  {% if user.is_authenticated %}
+	    <li><p class="navbar-text">Logged in as {{ user }}</li>
+	    <li class="divider-vertical"></li>
 	    <li><a href="{% url django.contrib.auth.views.logout %}">Log Out</a></li>
-	  </ul>
 	  {% endif %}
-
+	  </ul>
 	</div>
       </div>
     </div><!-- topbar -->
 
-    <!-- MAIN CONTENT -->
     <div class="container-fluid">
-      <div class='content'>
-	{% block content %}{% endblock %}
-      </div><!-- /content -->
+    <!-- MAIN CONTENT -->
+      <div class="row-fluid">
+	<div class="span2">
+	  {% block sidebar %}{% endblock %}
+	</div>
 
-      <div class="sidebar">
-	{% block sidebar %}{% endblock %}
-      </div><!-- /sidebar -->
-    </div><!-- /container-fluid -->
+	<div class="span10">
+	  {% block content %}{% endblock %}
+	</div>
+    </div>
 
   </body>
 </html>