Commit 9dbd7375 authored by Raph El's avatar Raph El

Merge branch 'master' of https://github.com/pixelhumain/co2

parents 406a2800 38afd7ce
......@@ -231,7 +231,7 @@ function autoCompleteSearchGS(search, indexMin, indexMax, input){
mylog.log("type", type);
if(type != "city" && type != "zone" ){
str += "<a href='"+url+"' class='lbh col-md-12 col-sm-12 col-xs-12 no-padding searchEntity'>";
str += "<div class='col-md-2 col-sm-2 col-xs-2 no-padding entityCenter'>";
str += "<div class='col-md-2 col-sm-2 col-xs-2 no-padding entityCenter text-center'>";
str += htmlIco;
str += "</div>";
str += "<div class='col-md-10 col-sm-10 col-xs-10 entityRight'>";
......
......@@ -524,11 +524,11 @@
<?php if($contextParentType == Organization::COLLECTION || $contextParentType == Project::COLLECTION || $contextParentType == Event::COLLECTION){ ?>
<div class="dropdown no-padding pull-right">
<a data-toggle="dropdown" class="btn btn-default" id="btn-toogle-dropdown-targetIsAuthor" href="#">
<?php if(@$parent["profilThumbImageUrl"]){ ?>
<img height=20 width=20 src='<?php echo Yii::app()->getRequest()->getBaseUrl(true).$parent["profilThumbImageUrl"] ?>'>
<?php } else{ ?>
<img height=20 width=20 src='<?php echo $this->module->assetsUrl.'/images/thumb/default_'.$contextParentType.'.png' ?>'>
<?php } ?>
<?php if(@Yii::app()->session["user"]["profilThumbImageUrl"]){ ?>
<img height=20 width=20 src='<?php echo Yii::app()->getRequest()->getBaseUrl(true).Yii::app()->session["user"]["profilThumbImageUrl"]; ?>'>
<?php } else { ?>
<img height=20 width=20 src='<?php echo $this->module->assetsUrl.'/images/thumb/default_citoyens.png' ?>'>
<?php } ?>
<i class="fa fa-caret-down" style="font-size:inherit;"></i>
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
......@@ -556,7 +556,7 @@
</a>
</li>
</ul>
<input type="hidden" id="authorIsTarget" value="1"/>
<input type="hidden" id="authorIsTarget" value="0"/>
</div>
<?php } ?>
<?php } ?>
......
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