Merge branch 'master' of https://gitlab.adullact.net/pixelhumain/co2

assets/js/default/directory.js

@@ -3265,7 +3265,7 @@ var directory = {
           footerStr += '<div class="pageTable col-md-12 col-sm-12 col-xs-12 text-center"></div>';
         if(userId != ""){
           if(typeof searchObject.ranges == "undefined"){
-            console.log(searchObject, "quepassoaqui");
+            /*console.log(searchObject, "quepassoaqui");
             addType=searchObject.types[0];
             typeForm = addType;
             if(addType=="persons"){
@@ -3304,7 +3304,7 @@ var directory = {
               footerStr +='<div class="col-md-12 col-sm-12 col-xs-12 padding-5">'+
                 btn;
               '</div>';
-            }
+            }*/
           } /*else{
           btn='<button class="btn btn-default btn-circle-1 btn-create-page bg-green-k text-white tooltips" '+
             'data-target="#dash-create-modal" data-toggle="modal" '+

views/app/page.php

@@ -228,7 +228,7 @@ function initPageInterface(){
     });
 
     $(".tooltips").tooltip();
-    affixPageMenu=$("#header-banner").outerHeight()+$("#mainNav").outerHeight()+$("#contentBanner").outerHeight();
+    affixPageMenu=$("#header-banner").outerHeight()+$("#mainNav").outerHeight()+$("#contentBanner").outerHeight()-$('.sub-menu-social').outerHeight();
     $('.sub-menu-social').affix({
       offset: {
           top: affixPageMenu

views/element/banner.php

@@ -58,6 +58,9 @@
 	.badgePH{
 		padding: 5px 10px;
 	}
+	#contentBanner{
+		min-height: 280px;
+	}
 </style>
 
 <?php