issue #0001653 : Text and design change, open to everybody

This commit is contained in:
Michael RICOIS 2013-11-20 15:49:13 +00:00
parent 3ee982ed27
commit ed89f9b6b0
2 changed files with 38 additions and 26 deletions

View File

@ -97,17 +97,19 @@
<?php }?>
<?php }?>
</td>
<?php if (empty($this->AutrePage)) { ?>
<?php if( $this->accessWorldCheck ) { ?>
<?php if (empty($this->AutrePage) && $this->accessWorldCheck) {?>
<td>
<?php if ($dir->Societe != '') { ?>
<img class="wcheck" id="<?='/dirType/ORGANISATION/dirSociete/'.$dir->Societe;?>" src='/themes/default/images/worldcheck/wc.png'/>
<?php }
if ($dir->Nom != '') { ?>
<img class="wcheck" id="<?='/dirType/INDIVIDUAL/dirNom/'.$dir->Nom.'/dirPrenom/'.$dir->Prenom;?>" src='/themes/default/images/worldcheck/wc.png'/>
<img class="wcheck" data-url="<?=$this->url(array(
'controller'=>'worldcheck','action'=>'occurence','siren'=>substr($this->siret,0,9),
'dirType'=>'ORGANISATION','dirSociete'=>$dir->Societe),null,true);?>" src='/themes/default/images/worldcheck/wc.png'/>
<?php }?>
<?php if ($dir->Nom != '') { ?>
<img class="wcheck" data-url="<?=$this->url(array(
'controller'=>'worldcheck','action'=>'occurence','siren'=>substr($this->siret,0,9),
'dirType'=>'INDIVIDUAL','dirNom'=>$dir->Nom,'dirPrenom'=>$dir->Prenom),null,true);?>" src='/themes/default/images/worldcheck/wc.png'/>
<?php } ?>
</td>
<?php } ?>
<?php }?>
</tr>
<?php } ?>
@ -156,14 +158,21 @@ $('a.dialog').on('click', function(){
return false;
}
});
</script>
<?php }?>
<?php if (empty($this->AutrePage) && $this->accessWorldCheck) {?>
<script>
$('img.wcheck').each(function(){
$(this).qtip({
hide: { event: 'unfocus' },
show: { solo: true, delay: 1000 },
content: { title: {button: true}, text: "Chargement...",
ajax: { url: '<?=$this->url(array('controller'=>'worldcheck','action'=>'occurence','siren'=>substr($this->siret, 0, 9)),null,true);?>'+$(this).attr('id') } },
position: { my: "bottom left", at: "top center" }
show: { solo: true, delay: 500 },
content: {
button: true,
title: 'WorlCheck',
text: "Chargement...",
ajax: { url: $(this).data('url') } },
position: { my: 'right center', at: 'left center' }
});
});
</script>

View File

@ -1,20 +1,23 @@
<?=($this->occurrence===false) ? "WorldCheck<br/>Cliquez sur le lien" : "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));
<?php if ($this->occurrence===false) {?>
Aucune information disponible, Lancer une recherche.
<?php } else {?>
<?=$this->occurrence?> Occurrences.
<?php }?>
<?php
$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=='')
{
foreach ($param as $key =>$val) {
if ($val=='') {
unset($param[$key]);
}
}
?>
?>
<br/>
<a href="<?=$this->url($param, null, true)?>">Rechercher en WorldCheck</a>
<a href="<?=$this->url($param, null, true)?>">Rechercher dans WorldCheck</a>