refactored head away from templates

Conflicts:
	templates/generic_page.html
	templates/index.html
	templates/page.html

1 files changed, 25 insertions, 34 deletions

diff --git a/templates/page.html b/templates/page.html
index 2f3de358..a7c6a300 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,34 +1,25 @@
-<!doctype html>

-<html>

-<head>

-	<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 %}

-	{% if not nojavascript %}

-		<script type="text/javascript" src="{{ config.url_javascript }}"></script>

-		{% if not config.additional_javascript_compile %}

-		{% for javascript in config.additional_javascript %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}

-		{% endif %}

-	{% 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 %}

-	<header>

-		<h1>{{ title }}</h1>

-		<div class="subtitle">

-			{% if subtitle %}

-				{{ subtitle }}

-			{% endif %}

-			{% if mod and not hide_dashboard_link %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}

-		</div>

-	</header>

-	{{ body }}

-	<hr>

-	<footer>

-		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2013 Tinyboard Development Group</p>

-	</footer>

-</body>

-</html>

+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8">
+	{% include 'header.html' %}
+	<title>{{ title }}</title>
+</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 %}
+	<header>
+		<h1>{{ title }}</h1>
+		<div class="subtitle">
+			{% if subtitle %}
+				{{ subtitle }}
+			{% endif %}
+			{% if mod and not hide_dashboard_link %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}
+		</div>
+	</header>
+	{{ body }}
+	<hr>
+	<footer>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2013 Tinyboard Development Group</p>
+	</footer>
+</body>
+</html>