Commit 759dbf00 authored by alex's avatar alex
Browse files

Merge branch 'development' into custom-alex

parents 489b8620 ef34dab0
...@@ -60,6 +60,15 @@ function responsiveMenuLeft(menuTop){ ...@@ -60,6 +60,15 @@ function responsiveMenuLeft(menuTop){
} }
} }
function bindButtonMenu(){ 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(){ $("#btn-superadmin").click(function(){
loadAdminDashboard(); loadAdminDashboard();
}); });
......
...@@ -469,7 +469,7 @@ $projectList = []; ...@@ -469,7 +469,7 @@ $projectList = [];
<li> <li>
<a href='javascript:;' class='linkMenu linkOrganization' <a href='javascript:;' class='linkMenu linkOrganization'
data-key='".$idElt."' data-key='".$idElt."'
data-col='".Organization::CONTROLLER."' data-col='".$type."'
data-countmembers='".getCountMembers($elt)."' data-countmembers='".getCountMembers($elt)."'
data-countevents='".getCountEvents($elt)."' data-countevents='".getCountEvents($elt)."'
data-countprojects='".getCountProjects($elt)."' data-countprojects='".getCountProjects($elt)."'
...@@ -603,7 +603,8 @@ $projectList = []; ...@@ -603,7 +603,8 @@ $projectList = [];
$thumbImgUrl = getProfileThumbUrl($elt); $thumbImgUrl = getProfileThumbUrl($elt);
$shortDescription = getShortDescription($elt); $shortDescription = getShortDescription($elt);
$nbInscrits = count($elt['links']['members']);
$nbInscrits = (!empty($elt['links']['members']) ? count(@$elt['links']['members']) : 0);
?> ?>
...@@ -658,7 +659,7 @@ $projectList = []; ...@@ -658,7 +659,7 @@ $projectList = [];
?> ?>
</button> </button>
</div> --> </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> ?></a></div>
<div class="col-sm-4"><a class="customBtn" href="#">Contact</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> <div class="col-sm-4"><a class="customBtn" href="#">S'inscrire au projet</a></div>
......
...@@ -299,9 +299,9 @@ $this->renderPartial( $layoutPath.'modals.'.Yii::app()->params["CO2DomainName"]. ...@@ -299,9 +299,9 @@ $this->renderPartial( $layoutPath.'modals.'.Yii::app()->params["CO2DomainName"].
if( Yii::app()->params['rocketchatMultiEnabled'] && $type != Person::COLLECTION ) if( Yii::app()->params['rocketchatMultiEnabled'] && $type != Person::COLLECTION )
{ {
?> ?>
<div class="btn-group " id="paramsMenu"> <div class="btn-group " id="">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="dropdown"> <li class="dropdown dropdown-profil-menu-params">
<button type="button" class="btn btn-default bold"> <button type="button" class="btn btn-default bold">
<?php if(@Yii::app()->session["userId"] && $edit==true){ ?> <?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"); ?> <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"]. ...@@ -310,7 +310,7 @@ $this->renderPartial( $layoutPath.'modals.'.Yii::app()->params["CO2DomainName"].
<?php } ?> <?php } ?>
</span> </span>
</button> </button>
<ul class="dropdown-menu arrow_box menu-params"> <ul class="dropdown-menu arrow_box menu-params dropdown-profil-menu-params">
<?php <?php
if( $hasRC && @$element["tools"]["chat"] ) if( $hasRC && @$element["tools"]["chat"] )
...@@ -455,8 +455,8 @@ $this->renderPartial( $layoutPath.'modals.'.Yii::app()->params["CO2DomainName"]. ...@@ -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> <i class="fa fa-grav letter-red"></i> <span class="hidden-xs hidden-sm hidden-md"></span>
</button> </button>
<?php } ?> <?php } ?>
<ul class="nav navbar-nav" id="paramsMenu"> <ul class="nav navbar-nav" id="paramsMenu">
<li class="dropdown"> <li class="dropdown dropdown-profil-menu-params">
<button type="button" class="btn btn-default bold"> <button type="button" class="btn btn-default bold">
<?php if(@Yii::app()->session["userId"] && $edit==true){ ?> <?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"); ?> <i class="fa fa-cogs"></i> <span class="hidden-xs hidden-sm"><?php echo Yii::t("common", "Settings"); ?>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment