Merge remote-tracking branch 'origin/dev' into dev

catalog/static/catalog/css/body.css

@@ -425,12 +425,12 @@ div .sidebar-input input[type="text"] {
     height: 35px;
 }
 .control-sidebar{
-    right: -250px;
-    width: 250px;
+    right: -270px;
+    width: 270px;
 }
 .control-sidebar-bg{
-    right: -250px;
-    width: 250px;
+    right: -270px;
+    width: 270px;
 }
 .control-sidebar-open{
     right: 0px !important;

catalog/static/catalog/js/dataRetrieval.js

@@ -109,8 +109,10 @@ function updateCart(){
 };
 
 function deleteProductCar(element){
-    let id = element.parentElement.querySelector('span').id;
-    element.parentElement.parentElement.classList.remove('treeview');
+    // let id = element.parentElement.querySelector('span').id;
+    // element.parentElement.parentElement.classList.remove('treeview');
+    let id = element.parentElement.parentElement.querySelector('span').id;
+    element.parentElement.parentElement.parentElement.parentElement.classList.remove('treeview');
     $.ajax({
         type: 'POST',
         url: del_prod_cartDB_url,
@@ -120,7 +122,8 @@ function deleteProductCar(element){
         },
         dataType: 'json',
         success: function (data) {
-            element.parentElement.parentElement.remove();
+            //element.parentElement.parentElement.remove();
+            element.parentElement.parentElement.parentElement.parentElement.remove();
         }
     });
 }

catalog/templates/map.html

@@ -161,9 +161,9 @@
             </span>
           </a>
           <ul class="treeview-menu sidebar-form">
-            <span>Fecha inicial</span>
+            <span>Start Date</span>
             <li>{{searchForm.start}}</li>
-            <span>Fecha final</span>
+            <span>End Date</span>
             <li>{{searchForm.end}}</li>
           </ul>
         </li>

catalog/templates/templates.html

@@ -72,9 +72,14 @@
 <template id="product_cart_1">
   <li class="treeview">
     <a href="#">
+      <div class="row">
+        <div class="col-lg-2" style="padding-top:33px">
           <i class="fa fa-cubes"></i>
+        </div>
+        <div class="col-lg-8" style="padding: 0px">
+          <div>
             <span id="" ></span>
-      <i class="glyphicon glyphicon-remove" style="padding-left: 15px" onclick="deleteProductCar(this);"></i>
+          </div>
           <div>
             <label>Process: </label>
             <span></span>
@@ -90,6 +95,11 @@
           <span class="pull-right-container">
             <span class="label label-primary pull-right"></span>
           </span>
+        </div>
+        <div class="col-lg-2" style="padding-top:33px">
+          <i class="glyphicon glyphicon-remove" style="" onclick="deleteProductCar(this);"></i>
+        </div>
+      </div>
     </a>
     <ul class="treeview-menu sidebar-form">
       <li>