Merge branch 'master' of https://github.com/asiekierka/Tinyboard

Conflicts:
	mod.php

1 files changed, 1 insertions, 6 deletions

diff --git a/templates/page.html b/templates/page.html
index 8fbc49cd..457971af 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,14 +1,9 @@
 <!doctype html>

 <html>

 <head>

+	{% include 'header.html' %}

 	<meta charset="utf-8">

-	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}">

-	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}

 	<title>{{ title }}</title>

-	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">

-	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}

-	<script type="text/javascript">var configRoot="{{ config.root }}";</script>

-	{% if not nojavascript %}<script type="text/javascript" src="{{ config.url_javascript }}"></script>{% endif %}

 </head>

 <body>

 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr>{% endif %}