Merge "Actually include custom JS files"

This commit is contained in:
Jenkins 2016-07-18 12:54:39 +00:00 committed by Gerrit Code Review
commit 8e5885edab
2 changed files with 6 additions and 3 deletions

View File

@ -0,0 +1,5 @@
{%- for jsfile in script_files %}
{% if jsfile not in ('_static/jquery.js', '_static/underscore.js', '_static/doctools.js') %}
<script src="{{ pathto(jsfile, 1) }}" type="text/javascript"></script>
{% endif %}
{%- endfor %}

View File

@ -11,9 +11,6 @@
{% include 'css.html' %}
{%- for cssfile in css_files %}
<link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
{%- endfor %}
{%- for jsfile in js_files %}
<script src="{{ pathto(jsfile, 1) }}" type="text/javascript" />
{%- endfor %}
{# FAVICON #}
{% if favicon %}
@ -81,5 +78,6 @@ ga('send', 'pageview');
</div>
{% include 'footer.html' %}
{% include 'script_footer.html' %}
{% include 'js.html' %}
</body>
</html>