Merge branch 'development' into custom-alex

assets/js/default/profilSocial.js

@@ -60,6 +60,15 @@ function responsiveMenuLeft(menuTop){
 	}
 }
 function bindButtonMenu(){
+	$("#paramsMenu").click(function(){
+        $(".dropdown-profil-menu-params").addClass("open"); 
+    });
+    $(".dropdown-profil-menu-params .dropdown-menu").mouseleave(function(){ //alert("dropdown-user mouseleave");
+    	setTimeout(function(){ 
+    		//if(!$(".dropdown-profil-menu-params").is(":hover"))
+    			$(".dropdown-profil-menu-params").removeClass("open");
+    	}, 200);
+    });
 	$("#btn-superadmin").click(function(){
 		loadAdminDashboard();
 	});

views/custom/laRaffinerie.php

@@ -469,7 +469,7 @@ $projectList = [];
 							<li>
 								<a href='javascript:;' class='linkMenu linkOrganization' 
 									data-key='".$idElt."' 
-									data-col='".Organization::CONTROLLER."'
+									data-col='".$type."'
 									data-countmembers='".getCountMembers($elt)."'
 									data-countevents='".getCountEvents($elt)."'
 									data-countprojects='".getCountProjects($elt)."'
@@ -603,7 +603,8 @@ $projectList = [];
 			$thumbImgUrl 			= getProfileThumbUrl($elt);
 			$shortDescription = getShortDescription($elt);
 
-			$nbInscrits = count($elt['links']['members']);
+
+			$nbInscrits = (!empty($elt['links']['members']) ? count(@$elt['links']['members']) : 0);
 			
 		?>
 
@@ -658,7 +659,7 @@ $projectList = [];
 					?>
 					</button>
 				</div> -->
-				<div class="col-sm-4"><a class="customBtn" href="https://chat.communecter.org/channel/laRaffinerie"><?php echo Yii::t("cooperation", "Chat"); 
+				<div class="col-sm-4"><a class="customBtn" href="https://chat.communecter.org/channel/laRaffinerie" target="_blank"><?php echo Yii::t("cooperation", "Chat"); 
 					?></a></div>
 				<div class="col-sm-4"><a class="customBtn" href="#">Contact</a></div>
 				<div class="col-sm-4"><a class="customBtn" href="#">S'inscrire au projet</a></div>

views/element/profilSocial.php

@@ -299,9 +299,9 @@ $this->renderPartial( $layoutPath.'modals.'.Yii::app()->params["CO2DomainName"].
 		  			if( Yii::app()->params['rocketchatMultiEnabled'] && $type != Person::COLLECTION )
 	  				{
 			  		?>
-			  			<div class="btn-group " id="paramsMenu">
+			  			<div class="btn-group " id="">
 							<ul class="nav navbar-nav">
-								<li class="dropdown">
+								<li class="dropdown dropdown-profil-menu-params">
 									<button type="button" class="btn btn-default bold">
 										<?php if(@Yii::app()->session["userId"] && $edit==true){ ?>
 							  			<i class="fa fa-comments"></i> <span class="hidden-xs hidden-sm"><?php echo Yii::t("cooperation", "Chat"); ?>
@@ -310,7 +310,7 @@ $this->renderPartial( $layoutPath.'modals.'.Yii::app()->params["CO2DomainName"].
 							  			<?php } ?>
 							  			</span>
 							  		</button> 
-							  		<ul class="dropdown-menu arrow_box menu-params">
+							  		<ul class="dropdown-menu arrow_box menu-params dropdown-profil-menu-params">
 
 						  			<?php
 						  			if( $hasRC && @$element["tools"]["chat"] )
@@ -455,8 +455,8 @@ $this->renderPartial( $layoutPath.'modals.'.Yii::app()->params["CO2DomainName"].
 			  	<i class="fa fa-grav letter-red"></i> <span class="hidden-xs hidden-sm hidden-md"></span>
 			  </button>
 			  <?php } ?>
-			<ul class="nav navbar-nav" id="paramsMenu">
-				<li class="dropdown">
+				<ul class="nav navbar-nav" id="paramsMenu">
+					<li class="dropdown dropdown-profil-menu-params">
 					<button type="button" class="btn btn-default bold">
 						<?php if(@Yii::app()->session["userId"] && $edit==true){ ?>
 			  			<i class="fa fa-cogs"></i> <span class="hidden-xs hidden-sm"><?php echo Yii::t("common", "Settings"); ?>