diff --git a/web/templates/base.html b/web/templates/base.html
index de3320c2ac72ec23c5f9e90bff6a8e49ff2cb517..76a0785fbe105d9fbb37f4021e73af7f43c96a8b 100644
--- a/web/templates/base.html
+++ b/web/templates/base.html
@@ -2,11 +2,20 @@
<html>
<head>
- <link rel="stylesheet" href="{{ MEDIA_URL }}/media/css/bootstrap.min.css" />
- <script type="text/javascript" src="{{ MEDIA_URL }}/media/js/jquery.js" ></script>
+ <link rel="stylesheet" href="/media/css/bootstrap.min.css" />
+ <script type="text/javascript" src="/media/js/jquery.js" ></script>
<script src="/media/js/bootstrap.js"></script>
+
+ {% block custom_css %}
+ {% endblock %}
+
+ {% block custom_javascript %}
+ {% endblock %}
+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Warpzone - {{ page_title }}</title>
+
<style>
.table-scrollable{
overflow: auto;
@@ -21,61 +30,58 @@
</script>
</head>
<body>
- {% if body == "login" %}
- <div class="wrap" style="background-color: #eee; height: 100%">
- {% endif %}
- <header>
- <nav class="navbar navbar-inverse img-rounded">
- <div class="container">
- <div class="navbar-header">
- <a class="navbar-brand" href="/">
- <img style="display: inline; text-align:left" height="25" width="25" src='/media/warpzone_logo.png'/> Warpzone
- </a>
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- </div>
- <div class="collapse navbar-collapse" id="myNavbar">
- {% if request.user.is_authenticated %}
- <ul class="nav navbar-nav">
- {% for page in pages %}
- {% if page.name != "Logout" and page.name != "Admin" and page.name != "Configuration" %}
- <li><a href="/{{ page.link }}">{{ page.name }}</a></li>
- {% endif %}
- {% endfor %}
- </ul>
- <ul class="nav navbar-nav navbar-right"><li><a href="/logout">{% trans "Logout" %}</a></li></ul>
- <ul class="nav navbar-nav navbar-right"><li><a href="/profile">{% trans "Profile Settings" %}</a></li></ul>
+ <header>
+ <nav class="navbar navbar-inverse">
+ <div class="container">
+ <div class="navbar-header">
+ <a class="navbar-brand" href="/">
+ <img style="display: inline; text-align:left" height="25" width="25" src='/media/warpzone_logo.png'/> Warpzone
+ </a>
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ </div>
+ <div class="collapse navbar-collapse" id="myNavbar">
+ {% if request.user.is_authenticated %}
+ <ul class="nav navbar-nav">
+ {% for page in pages %}
+ {% if page.name != "Logout" and page.name != "Admin" and page.name != "Configuration" %}
+ <li><a href="/{{ page.link }}">{{ page.name }}</a></li>
+ {% endif %}
+ {% endfor %}
+ </ul>
+ <ul class="nav navbar-nav navbar-right"><li><a href="/logout">{% trans "Logout" %}</a></li></ul>
+ <ul class="nav navbar-nav navbar-right"><li><a href="/profile">{% trans "Profile Settings" %}</a></li></ul>
- {% if user.is_superuser %}
- <ul class="nav navbar-nav navbar-right"><li><a href="/admin">{% trans "Admin" %}</a></li></ul>
- {% endif %}
+ {% if user.is_superuser %}
+ <ul class="nav navbar-nav navbar-right"><li><a href="/admin">{% trans "Admin" %}</a></li></ul>
+ {% endif %}
- {% endif %}
+ {% endif %}
+ </div>
</div>
- </div>
- </nav>
- </header>
+ </nav>
+ </header>
- <div class="container">
- {% block content %}
- {% endblock %}
+ <div class="container">
+ {% block content %}
+ {% endblock %}
- <br><br>
- </div>
- <footer>
- <div class="footer navbar-fixed-bottom img-rounded" style="background-color: #f5f5f5; border-top: solid; border-width: thin; border-color: grey">
- <div class="container">
+ <br><br>
+ </div>
+ <footer>
+ <div class="footer navbar-fixed-bottom" style="background-color: #f5f5f5; border-top: solid; border-width: thin; border-color: grey">
<div class="container">
- <div class="navbar-header">
- <p class="text-muted"><small>Warpzone</small></p>
+ <div class="container">
+ <div class="navbar-header">
+ <p class="text-muted"><small>Warpzone</small></p>
+ </div>
</div>
</div>
</div>
- </div>
- </footer>
-</body>
+ </footer>
+ </body>
</html>
diff --git a/web/templates/media/chart_js/vendor/Chart.js b/web/templates/media/chart_js/vendor/Chart.js
index 2c2b608dc3fd2ecdb69cbdbb4b66f73b32d975b6..0c9a78ad7a8184a12e3f845910b0d4c359ff20ff 100644
--- a/web/templates/media/chart_js/vendor/Chart.js
+++ b/web/templates/media/chart_js/vendor/Chart.js
@@ -739,12 +739,12 @@
},
getMaximumWidth = helpers.getMaximumWidth = function(domNode){
var container = domNode.parentNode;
- // TODO = check cross browser stuff with this.
+
return container.clientWidth;
},
getMaximumHeight = helpers.getMaximumHeight = function(domNode){
var container = domNode.parentNode;
- // TODO = check cross browser stuff with this.
+
return container.clientHeight;
},
getMaximumSize = helpers.getMaximumSize = helpers.getMaximumWidth, // legacy support