Merge branch 'restore_extra_script' into 'master'

restore extra_script

See merge request !24
This commit is contained in:
James Polley 2017-09-13 13:37:14 +00:00
commit 7a4ddcee6d

View file

@ -61,7 +61,9 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script src="{{ STATIC_URL }}/js/bootstrap.min.js" type="text/javascript"></script> <script src="{{ STATIC_URL }}/js/bootstrap.min.js" type="text/javascript"></script>
<script src="{{ STATIC_URL }}/js/jquery.formset.js"></script> <script src="{{ STATIC_URL }}/js/jquery.formset.js"></script>
{% block scripts_extra %}{% endblock %} {% block extra_script %}
{% endblock %}
{% block scripts_extra %}{% endblock %}
{% endblock %} {% endblock %}
<link rel='stylesheet' href='//cdn.jsdelivr.net/font-hack/2.020/css/hack-extended.min.css'> <link rel='stylesheet' href='//cdn.jsdelivr.net/font-hack/2.020/css/hack-extended.min.css'>