Issue #0001653: Remove links from WorldCheck icons and set links in qTip popups

This commit is contained in:
Aram HARUTYUNYAN 2013-09-23 12:53:05 +00:00
parent ceccd1600f
commit fb444fea84
5 changed files with 31 additions and 33 deletions

View File

@ -140,6 +140,7 @@ class WorldcheckController extends Zend_Controller_Action
$wcLocal = new Application_Model_Worldcheck();
$this->view->assign('occurrence', $wcLocal->getCount($data));
$this->view->assign('data', $data);
}
}

View File

@ -102,24 +102,12 @@ table.data td { border:1px solid #ccc; padding:5px; }
</td>
<?php if (empty($this->AutrePage)) { ?>
<?php if( $this->permission ) { ?>
<td>
<?php if ($dir->Societe != '') { ?>
<a class="wcheck" id="<?='/dirType/ORGANISATION/dirSociete/'.$dir->Societe;?>" href="<?=$this->url(array(
'controller'=>'worldcheck',
'action'=>'index',
'dirSociete'=>$dir->Societe,
'dirType' =>'ORGANISATION',
'siren'=>$dir->Siren), null, true)?>"><img src='/themes/default/images/worldcheck/wc.png'/></a>
<img class="wcheck" id="<?='/dirType/ORGANISATION/dirSociete/'.$dir->Societe;?>" src='/themes/default/images/worldcheck/wc.png'/>
<?php }
if ($dir->Nom != '') { ?>
<a class="wcheck" id="<?='/dirType/INDIVIDUAL/dirNom/'.$dir->Nom.'/dirPrenom/'.$dir->Prenom;?>" href="<?=$this->url(array(
'controller'=>'worldcheck',
'action'=>'index',
'dirNom'=>$dir->Nom,
'dirPrenom'=>$dir->Prenom,
'dirType' =>'INDIVIDUAL',
'siren'=>$dir->Siren), null, true)?>"><img src='/themes/default/images/worldcheck/wc.png'/></a>
<img class="wcheck" id="<?='/dirType/INDIVIDUAL/dirNom/'.$dir->Nom.'/dirPrenom/'.$dir->Prenom;?>" src='/themes/default/images/worldcheck/wc.png'/>
<?php } ?>
</td>
<?php } ?>
@ -172,7 +160,7 @@ $('a.dialog').on('click', function(){
}
});
$('a.wcheck').each(function(){
$('img.wcheck').each(function(){
$(this).qtip({
hide: { event: 'unfocus' },
show: { solo: true, delay: 1000 },

View File

@ -60,16 +60,10 @@ echo $this->partial('identite/fiche-item.phtml', $this->dBlock['AutreSiren']);
<div class="paragraph">
<div style="float:right;">
<?php if($this->permission) { ?>
<?php //echo $this->action('occurence','worldcheck', null, array('dirSociete'=>$this->infos->Nom, 'dirType' =>'ORGANISATION', 'siren' => substr($this->siret, 0, 9)));?>
<a class="wcheck" href="<?=$this->url(array(
'controller'=>'worldcheck',
'action'=>'index',
'dirSociete'=>$this->infos->Nom,
'dirType' =>'ORGANISATION',
'siren'=>substr($this->siret, 0, 9)), null, true)?>"><img src='/themes/default/images/worldcheck/wc.png'/></a>
<img class="wcheck" src='/themes/default/images/worldcheck/wc.png'/>
</div>
<script>
$('a.wcheck').each(function(){
$('img.wcheck').each(function(){
$(this).qtip({
hide: { event: 'unfocus' },
show: { solo: true, delay: 1000 },

View File

@ -145,17 +145,13 @@ if ($associate->associatetype=='ASSOCIATE')
$dirName = 'dirSociete';
}
?>
<? $params = array(
'controller'=>'worldcheck',
'action'=>'index',
$dirName => $associate->targetEntity->names->name[0]->lastName,
'dirPrenom' => $associate->targetEntity->names->name[0]->givenName,
'dirType' => $dirType);?>
Associate: <?=$associate->targetEntity->names->name[0]->fullName;?>
<div style='float:right;'><a class="wcheck" id="<?='/dirType/'.$dirType.'/'.$dirName.'/'.$associate->targetEntity->names->name[0]->lastName.'/dirPrenom/'.$associate->targetEntity->names->name[0]->givenName?>" href="<?=$this->url($params, null, true)?>">
<img src='/themes/default/images/worldcheck/wc-blanc.png'/></a></div>
<div style='float:right;'>
<?php $id='/dirType/'.$dirType.'/'.$dirName.'/'.$associate->targetEntity->names->name[0]->lastName.'/dirPrenom/'.$associate->targetEntity->names->name[0]->givenName;?>
<img class="wcheck" id="<?=$id;?>" src='/themes/default/images/worldcheck/wc-blanc.png'/>
</div>
<script>
$('a.wcheck').each(function(){
$('img.wcheck').each(function(){
$(this).qtip({
hide: { event: 'unfocus' },
show: { solo: true, delay: 1000 },

View File

@ -1 +1,20 @@
<?=($this->occurrence===false) ? "WorldCheck<br/>Cliquez sur l&rsquo;icone WorldCheck" : "WorldCheck<br/>Occurrences: ".$this->occurrence;?>
<?=($this->occurrence===false) ? "WorldCheck<br/>Cliquez sur l&rsquo;icone WorldCheck" : "WorldCheck<br/>Occurrences: ".$this->occurrence;?>
<? $param = array(
'controller'=>'worldcheck',
'action'=>'index',
'dirSociete'=>$this->data->Societe,
'dirNom'=>$this->data->Nom,
'dirPrenom'=>$this->data->Prenom,
'dirType' =>$this->data->Type,
'siren'=>substr($this->siret, 0, 9));
foreach ($param as $key =>$val)
{
if ($val=='')
{
unset($param[$key]);
}
}
?>
<br/>
<a href="<?=$this->url($param, null, true)?>">Rechercher en WorldCheck</a>