header abstraction: abstracted also in thread.html

Conflicts:
	templates/page.html
	templates/thread.html

1 files changed, 5 insertions, 31 deletions

diff --git a/templates/thread.html b/templates/thread.html
index 5882d9b6..a6b8793f 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -2,34 +2,8 @@
 <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 %}
+	{% include 'header.html' %}
 	<title>{{ board.url }} - {% if config.thread_subject_in_title and thread.subject %}{{ thread.subject }}{% else %}{{ board.title|e }}{% endif %}</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
-	{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
-	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
-	{% if config.font_awesome %}<link rel="stylesheet" media="screen" href="{{ config.root }}{{ config.font_awesome_css }}">{% 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 %}
-	{% if config.recaptcha %}<style type="text/css">{% raw %}
-		.recaptcha_image_cell {
-			background: none !important;
-		}
-		table.recaptchatable {
-			border: none !important;
-		}
-		#recaptcha_logo, #recaptcha_tagline {
-			display: none;
-			float: right;
-		}
-		.recaptchatable a {
-			display: block;
-		}
-	{% endraw %}</style>{% endif %}
 </head>
 <body>
 	{{ boardlist.top }}
@@ -44,11 +18,11 @@
 			{% if mod %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}
 		</div>
 	</header>
-	
+
 	<div class="banner">{% trans %}Posting mode: Reply{% endtrans %} <a class="unimportant" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a></div>
-	
+
 	{% include 'post_form.html' %}
-	
+
 	{% if config.blotter %}<hr /><div class="blotter">{{ config.blotter }}</div>{% endif %}
 	<hr />
 	<form name="postcontrols" action="{{ config.post_url }}" method="post">
@@ -68,4 +42,4 @@
 		ready();
 	{% endraw %}</script>
 </body>
-</html>
+</html>
\ No newline at end of file