From 67d089104cdc4fce852b263244b013f435c5e911 Mon Sep 17 00:00:00 2001
From: Paolo Pasquali <paolo.pasquali@gmail.com>
Date: Wed, 14 May 2014 11:15:43 +0200
Subject: [PATCH] Fix bower, grunt

---
 geonode/static/bower.json                   | 7 +++++--
 geonode/static/geonode/js/search/explore.js | 2 +-
 geonode/static/gruntfile.js                 | 2 +-
 geonode/templates/base.html                 | 4 +---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/geonode/static/bower.json b/geonode/static/bower.json
index 09c73d8350b..07d175521a5 100644
--- a/geonode/static/bower.json
+++ b/geonode/static/bower.json
@@ -4,10 +4,10 @@
   "main": "geonode/css/base.css",
   "componentsDirectory": ".components",
   "dependencies": {
-    "bootstrap": "2.3.2",
+    "bootstrap": "3.1.1",
     "datatables": "1.9.4",
     "select2": "3.2.0",
-    "jquery": "1.8.3",
+    "jquery": "1.11.0",
     "jquery-timeago": "0.11.4",
     "jquery-ui": "1.10.1",
     "requirejs": "2.1.2",
@@ -25,5 +25,8 @@
     "jquery.ajaxQueue": "https://github.com/gnarf/jquery-ajaxQueue.git",
     "angular": "1.2.6",
     "angular-leaflet-directive": "~0.7.3"
+  },
+  "resolutions": {
+    "jquery": "1.11.0"
   }
 }
diff --git a/geonode/static/geonode/js/search/explore.js b/geonode/static/geonode/js/search/explore.js
index 0fa47f5e928..205fabad830 100644
--- a/geonode/static/geonode/js/search/explore.js
+++ b/geonode/static/geonode/js/search/explore.js
@@ -1,6 +1,6 @@
 $(function() {
 
-    $( ".datepicker" ).datepicker();
+    //$( ".datepicker" ).datepicker();
     
     $("[data-viewby]").each(function() {
         $(this).find("nav.viewby a."+$(this).data("viewby")).addClass("active");
diff --git a/geonode/static/gruntfile.js b/geonode/static/gruntfile.js
index 2b1b126a053..e3769c580a3 100644
--- a/geonode/static/gruntfile.js
+++ b/geonode/static/gruntfile.js
@@ -199,7 +199,7 @@ module.exports = function(grunt) {
             'lib/js/bootstrap-datepicker.js',
             'lib/js/json2.js',
             'lib/js/select2.js',
-            'lib/js/bootstrap.js',
+            //'lib/js/bootstrap.min.js',
             'lib/js/angular.js',
             'lib/js/angular-leaflet-directive.min.js'
           ],
diff --git a/geonode/templates/base.html b/geonode/templates/base.html
index 1f861b5d7ff..96e8f7e3ad2 100644
--- a/geonode/templates/base.html
+++ b/geonode/templates/base.html
@@ -302,8 +302,7 @@ <h4><a href="{{ announcement.get_absolute_url }}">{{ announcement }}</a></h4>
     <script src="{{ STATIC_URL }}lib/js/jquery.ajaxQueue.js"></script>
     <script src="{{ STATIC_URL }}lib/js/jquery-ui.custom.js"></script>
     <script src="{{ STATIC_URL }}lib/js/jquery.raty.js"></script>
-    <!-- <script src="{{ STATIC_URL }}lib/js/bootstrap.js"></script> -->
-    <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+    <script src="{{ STATIC_URL }}lib/js/bootstrap.min.js"></script>
     <script src="{{ STATIC_URL }}lib/js/json2.js"></script>
     <script src="{{ STATIC_URL }}lib/js/select2.js"></script>
     <script src="{{ STATIC_URL }}lib/js/waypoints.js"></script>
@@ -314,7 +313,6 @@ <h4><a href="{{ announcement.get_absolute_url }}">{{ announcement }}</a></h4>
     <script src="{{ STATIC_URL }}geonode/js/base/base.js"></script>
 
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-    <!-- <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script> -->
 
     {% block extra_script %}{% endblock extra_script %}