Merge pull request #115 from Macil/miscfixes

Miscellaneous fixes

1 files changed, 6 insertions, 1 deletions

diff --git a/templates/page.html b/templates/page.html
index e66b3fff..2f3de358 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -7,7 +7,12 @@
 	<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>{% 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 %}