install official jquery through bower

diff --git a/app/scripts/app.sh b/app/scripts/app.sh
index 5d6c984c844266e9271a7991fd080fa80a021770..1d626fce2906c42689e0a1dac874d69a26f7e66d 100644 (file)
--- a/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@ -29,6 +29,7 @@ sh $app/scripts/wait.sh
 # django setup
 python $manage wait-for-db
 python $manage migrate --noinput
+python $manage bower_install -- --allow-root
 python $manage collectstatic --noinput
 python $manage create-admin-user
 

diff --git a/app/templates/includes/footer_scripts.html b/app/templates/includes/footer_scripts.html
index 4be9403f021ba9b83a14fcd5372891374ff335b0..95d3cac980bde71a2aea4f0077fabe82bf522dce 100644 (file)
--- a/app/templates/includes/footer_scripts.html
+++ b/app/templates/includes/footer_scripts.html
@@ -1,7 +1,7 @@
 {% load mezzanine_tags i18n staticfiles %}
 
 {% compress js %}
-    <script src="https://code.jquery.com/jquery-1.12.1.min.js"></script>
+    <script src="{{ STATIC_URL }}jquery/dist/jquery.min.js"></script>
     <script>window.jQuery || document.write('<script src="{% static "js/vendor/jquery.1.12.1.min.js" %}"><\/script>')</script>
     <script src="{% static "mezzanine/js/"|add:settings.JQUERY_FILENAME %}"></script>
     <script src="{% static "js/plugins.js" %}"></script>