Backporting PRs fixes from master: #3866 #3865 #3864

GeoNode · Aug 3, 2018 · 62bc2f9 · 62bc2f9
1 parent d50d677
commit 62bc2f9
Show file tree

Hide file tree

Showing 12 changed files with 8,212 additions and 5,959 deletions.
diff --git a/geonode/static/bower.json b/geonode/static/bower.json
@@ -23,8 +23,8 @@
     "multi-select": "https://github.com/lou/multi-select.git",
     "jquery-ajaxprogress": "https://github.com/kpozin/jquery-ajaxprogress.git",
     "jquery.ajaxQueue": "https://github.com/gnarf/jquery-ajaxQueue.git",
-    "angular": "1.4.7",
-    "angular-cookies": "1.3.6",
+    "angular": "1.4.0",
+    "angular-cookies": "1.4.0",
     "angular-leaflet-directive": "0.7.9",
     "zeroclipboard": "2.1.5",
     "leaflet-fullscreen": "https://github.com/Leaflet/Leaflet.fullscreen.git",
@@ -44,8 +44,8 @@
     "Leaflet.EasyButton": "^2.2.4"
   },
   "resolutions": {
-    "angular": "1.3.x",
-    "leaflet": "~1.0.1",
-    "bootstrap": "3.3.7"
+    "angular": "1.4.0",
+    "bootstrap": "3.3.7",
+    "leaflet": "~1.0.1"
   }
 }
diff --git a/geonode/static/geonode/css/base.css b/geonode/static/geonode/css/base.css
@@ -7288,6 +7288,9 @@ article.tab-pane {
   font-size: 12px;
   text-transform: uppercase;
 }
+.item-details h4 a {
+  word-wrap: break-word;
+}
 .item-details .btn-sm {
   margin-right: -17px;
   margin-top: -1px;

diff --git a/geonode/static/geonode/js/templates/cart.html b/geonode/static/geonode/js/templates/cart.html
@@ -8,6 +8,6 @@
     <p>Add {{ facetType | default_if_blank : 'objects' }} through the "checkboxes".</p>
   </div>
   <ul class="list-group">
-    <li class="list-group-item" ng-repeat="resource in cart.getCart().items">{{ resource.title | limitTo: 25}}{{ resource.title.length > 25 ? '...' : '' }}<button class="btn btn-default btn-xs pull-right" ng-click="cart.removeItem(resource)"><i class="fa fa-remove fa-lg"></i></button></li>
+    <li class="list-group-item clearfix" ng-repeat="resource in cart.getCart().items">{{ resource.title | limitTo: 25}}{{ resource.title.length > 25 ? '...' : '' }}<button class="btn btn-default btn-xs pull-right" ng-click="cart.removeItem(resource)"><i class="fa fa-remove fa-lg"></i></button></li>
   </ul>
 </div>
diff --git a/geonode/static/geonode/less/base.less b/geonode/static/geonode/less/base.less
@@ -450,6 +450,9 @@ article.tab-pane {
       text-transform: uppercase;
     }
   }
+  h4 a {
+    word-wrap: break-word;
+  }
   .btn-sm {
     margin-right: -17px;
     margin-top: -1px;