Skip to content

C
course-discovery
Commit ed9999ea by Clinton Blackburn
Options

Installing jQuery via bower and properly compressing JS in base template

parent b8619066
Showing with 25 additions and 19 deletions
bower.json
......@@ -17,6 +17,7 @@
"clipboard": "1.5.12",
"jquery-ui": "1.10.3",
"js-cookie": "2.1.2",
"datatables": "1.10.12"
"datatables": "1.10.12",
"jquery": "^3.1.1"
}
}
course_discovery/templates/base.html
......@@ -7,23 +7,9 @@
<!DOCTYPE html>
<html>
<head lang="{{ language_code }}">
<meta charset="UTF-8">
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}{% endblock title %} | {{ platform_name }}</title>
<script type="text/javascript" language="javascript" src="//code.jquery.com/jquery-1.11.3.min.js"></script>
<script src="{% static 'bower_components/js-cookie/src/js.cookie.js' %}"></script>
<script src="{% static 'bower_components/underscore/underscore.js' %}"></script>
<script src="{% static 'bower_components/moment/moment.js' %}"></script>
<script src="{% static 'bower_components/pikaday/pikaday.js' %}"></script>
<script src="{% static 'bower_components/datatables/media/js/jquery.dataTables.js' %}"></script>
<script src="{% static 'js/publisher/views/navbar.js' %}"></script>
<script src="{% static 'js/utils.js' %}"></script>
<script src="{% url 'javascript-catalog' %}"></script>
<script type="text/javascript">
$(document).ready(function () {
addDatePicker();
});
</script>
{% compress css %}
{% block stylesheets %}
......@@ -32,9 +18,11 @@
{% else %}
<link rel="stylesheet" href="{% static 'sass/main-ltr.scss' %}" type="text/x-scss">
{% endif %}
<link rel="stylesheet" href="{% static 'bower_components/font-awesome/css/font-awesome.css' %}" type="text/x-scss">
<link rel="stylesheet" href="{% static 'bower_components/font-awesome/css/font-awesome.css' %}"
type="text/x-scss">
<link rel="stylesheet" href="{% static 'bower_components/pikaday/css/pikaday.css' %}" type="text/x-scss">
<link rel="stylesheet" href="{% static 'bower_components/datatables/media/css/jquery.dataTables.css' %}" type="text/x-scss">
<link rel="stylesheet" href="{% static 'bower_components/datatables/media/css/jquery.dataTables.css' %}"
type="text/x-scss">
{% endblock %}
{% endcompress %}
</head>
......@@ -74,8 +62,25 @@
</div>
{% block extra_js %}
{% compress js %}
<script src="{% static 'bower_components/jquery/dist/jquery.js' %}"></script>
<script src="{% static 'bower_components/js-cookie/src/js.cookie.js' %}"></script>
<script src="{% static 'bower_components/underscore/underscore.js' %}"></script>
<script src="{% static 'bower_components/moment/moment.js' %}"></script>
<script src="{% static 'bower_components/pikaday/pikaday.js' %}"></script>
<script src="{% static 'bower_components/datatables/media/js/jquery.dataTables.js' %}"></script>
<script src="{% static 'js/publisher/views/navbar.js' %}"></script>
<script src="{% static 'js/utils.js' %}"></script>
{% endcompress %}
<script src="{% url 'javascript-catalog' %}"></script>
<script type="text/javascript">
$(document).ready(function () {
addDatePicker();
});
</script>
{% block extra_js %}
{% endblock %}
</body>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment