Merge "Split the dashboard into different apps, add tests"

[pharos.git] / tools / pharos-dashboard / templates / layout.html

diff --git a/tools/pharos-dashboard/templates/layout/base.html b/tools/pharos-dashboard/templates/layout.html
similarity index 85%
rename from tools/pharos-dashboard/templates/layout/base.html
rename to tools/pharos-dashboard/templates/layout.html
index e9e1cd1..db9490f 100644 (file)
--- a/tools/pharos-dashboard/templates/layout/base.html
+++ b/tools/pharos-dashboard/templates/layout.html
@@ -50,9 +50,12 @@
 {% block basecontent %}
 {% endblock basecontent %}
 
-<!-- jQuery -->
-<script src="{% static "bower_components/jquery/dist/jquery.min.js" %}"></script>
-<script src="{% static "bower_components/jquery-migrate/jquery-migrate.min.js" %}"></script>
+
+<script src="https://code.jquery.com/jquery-2.2.4.min.js"
+        integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
+{#<!-- jQuery -->#}
+{#<script src="{% static "bower_components/jquery/dist/jquery.min.js" %}"></script>#}
+{#<script src="{% static "bower_components/jquery-migrate/jquery-migrate.min.js" %}"></script>#}
 
 {#<script src="https://code.jquery.com/jquery-2.2.0.min.js"></script>#}
 <!-- Bootstrap Core JavaScript -->