New theme update

This commit is contained in:
Michael RICOIS 2015-07-21 14:56:05 +00:00
parent 57e3cbbc33
commit 42c24485bc
7 changed files with 110 additions and 145 deletions

View File

@ -1,14 +1,10 @@
<?php if (empty($this->AutrePage)) {?>
<div class="row"><h1 class="titre"><?=$this->translate("Eléments financier")?></h1></div>
<div class="row"><h1 class="titre"><?=$this->translate("Eléments financiers")?></h1></div>
<table class="identite">
<tr>
<td width="30">&nbsp;</td>
<td width="200" class="StyleInfoLib">
Num&eacute;ro identifiant Siren
</td>
<td width="350" class="StyleInfoData">
<?php echo $this->SirenTexte($this->siren);?>
</td>
<td width="200" class="StyleInfoLib">Num&eacute;ro identifiant Siren</td>
<td width="350" class="StyleInfoData"><?php echo $this->SirenTexte($this->siren);?></td>
</tr>
<tr>
<td width="30">&nbsp;</td>
@ -38,17 +34,18 @@
</table>
<?php if ( empty($this->AutrePage) ) {?>
<div id="liasse-check-result" class="ui-state-highlight ui-corner-all" style="margin-top: 5px;">
<p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
<div class="ui-widget">
<div id="liasse-check-result" class="ui-state-highlight ui-corner-all" style="margin-top: 5px; padding: .5em .5em 0 .5em;">
<p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
<a title="Cliquez ici pour vérifier l'intégration des éléments financiers"
href="<?=$this->url(array('controller'=>'finance','action'=>'liasseinfos','siren'=>$this->siren), 'default', true)?>"
id="liasse-check">Vérifier la disponibilité des derniers états financiers au Greffe.</a></p>
</div>
</div>
<?php }?>
<?php }?>
<?php if($this->typeBilan == 'B' || $this->typeBilan == 'A') {?>
<table class="table">
@ -74,16 +71,16 @@
<div class="row"><h2>Bilan actif - passif</h2></div>
<table class="table table-bordered bilans">
<thead>
<tr>
<th>Actif</th>
<?php foreach($this->tabResultActif as $info) { ?>
<th class="date" >
<?=$info['dateCloture']?><br/><?=$info['duree']?>
</th>
<?php }?>
<?php $lastDateCloture = $info['dateCloture']; ?>
<th>% T.B.</th>
</tr>
<tr>
<th>Actif</th>
<?php foreach($this->tabResultActif as $info) { ?>
<th class="date" >
<?=$info['dateCloture']?><br/><?=$info['duree']?>
</th>
<?php }?>
<?php $lastDateCloture = $info['dateCloture']; ?>
<th>% T.B.</th>
</tr>
</thead>
<tbody>
<?php foreach($this->tabRatioActif as $idRatio => $info) { ?>
@ -94,21 +91,17 @@
<td class="left"><?=$value['entrep'][$idRatio]?></td>
<?php }?>
<td><?=$value['total'][$idRatio]?></td>
</tr>
<?php }?>
<tr>
<td colspan="7">
<?=$this->action('bilangraph', 'finance', null, array('type' => 'actif', 'typeBilan' => $this->typeBilan,
'dateCloture' => $this->lastDateCloture, 'siret' => $this->siret, 'id' => $this->id))?>
</td>
</tr>
</tbody>
</table>
<div class="paragraph">
<?=$this->action('bilangraph', 'finance', null, array(
'type' => 'actif',
'typeBilan' => $this->typeBilan,
'dateCloture' => $this->lastDateCloture,
'siret' => $this->siret,
'id' => $this->id,
))?>
</div>
<table class="table table-bordered bilans">
<thead>
<tr>
@ -130,61 +123,53 @@
<td class="left"><?=$value['entrep'][$idRatio]?></td>
<?php }?>
<td><?=$value['total'][$idRatio]?></td>
</tr>
<?php }?>
<tr>
<td colspan="7"><?=$this->action('bilangraph', 'finance', null, array('type' => 'passif',
'typeBilan' => $this->typeBilan, 'dateCloture' => $this->lastDateCloture, 'siret' => $this->siret,
'id' => $this->id))?>
</td>
</tr>
</tbody>
</table>
<div class="paragraph">
<?=$this->action('bilangraph', 'finance', null, array(
'type' => 'passif',
'typeBilan' => $this->typeBilan,
'dateCloture' => $this->lastDateCloture,
'siret' => $this->siret,
'id' => $this->id,
))?>
</div>
<div class="row"><h2>Soldes Intermédiaire de Gestion</h2></div>
<table class="table table-bordered bilans">
<thead>
<tr>
<th colspan="2">SOLDES INTERMEDIAIRE DE GESTION</th>
<?php foreach($this->tabResultSig as $info) { ?>
<th class="date" >
<?=$info['dateCloture']?><br/><?=$info['duree']?>
</th>
<?php }?>
<th>% C.A.</th>
</tr>
<tr>
<th colspan="2">SOLDES INTERMEDIAIRE DE GESTION</th>
<?php foreach($this->tabResultSig as $info) { ?>
<th class="date" >
<?=$info['dateCloture']?><br/><?=$info['duree']?>
</th>
<?php }?>
<th>% C.A.</th>
</tr>
</thead>
<tbody>
<?php foreach($this->tabRatioSig as $idRatio => $info) { ?>
<tr<?php if (!empty($info['class'])) echo ' class="'.$info['class'].'"'?>>
<?php if(empty($info['op'])){?>
<td colspan="2"><?=$info['titre']?></td>
<?php } else {?>
<td><?=$info['op']?></td><td><?=$info['titre']?></td>
<?php }?>
<?php foreach($this->tabResultSig as $value) { ?>
<td class="left"><?=$value['entrep'][$idRatio]?></td>
<?php }?>
<td><?=$value['total'][$idRatio]?></td>
<?php }?>
</tr>
<?php foreach($this->tabRatioSig as $idRatio => $info) { ?>
<tr<?php if (!empty($info['class'])) echo ' class="'.$info['class'].'"'?>>
<?php if(empty($info['op'])){?>
<td colspan="2"><?=$info['titre']?></td>
<?php } else {?>
<td><?=$info['op']?></td><td><?=$info['titre']?></td>
<?php }?>
<?php foreach($this->tabResultSig as $value) { ?>
<td class="left"><?=$value['entrep'][$idRatio]?></td>
<?php }?>
<td><?=$value['total'][$idRatio]?></td>
</tr>
<?php }?>
<tr>
<td colspan="8"><?=$this->action('bilangraph', 'finance', null, array('type' => 'sig',
'typeBilan' => $this->typeBilan, 'dateCloture' => $this->lastDateCloture, 'siret' => $this->siret,
'id' => $this->id))?>
</td>
</tr>
</tbody>
</table>
<div class="paragraph">
<?=$this->action('bilangraph', 'finance', null, array(
'type' => 'sig',
'typeBilan' => $this->typeBilan,
'dateCloture' => $this->lastDateCloture,
'siret' => $this->siret,
'id' => $this->id,
))?>
</div>
<?php }?>
<?php }?>

View File

@ -1,4 +1,4 @@
<div class="row"><h1 class="titre">Flux de Trésorerie <span style="color:red;">(beta)</span></h1></div>
<div class="row"><h1 class="title">Flux de Trésorerie <span class="label label-warning pull-right">beta</span></h1></div>
<table>
<tr>
<td width="30">&nbsp;</td>

View File

@ -65,11 +65,13 @@
</table>
<?php if ( empty($this->AutrePage) && isset($this->tabResult) ) {?>
<div id="liasse-check-result" class="ui-state-highlight ui-corner-all" style="margin-top: 5px;">
<p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
<div class="ui-widget">
<div id="liasse-check-result" class="ui-state-highlight ui-corner-all" style="margin-top: 5px; padding: .5em .5em 0 .5em;">
<p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
<a title="Cliquez ici pour vérifier l'intégration des éléments financiers"
href="<?=$this->url(array('controller'=>'finance','action'=>'liasseinfos','siren'=>$this->siren), 'default', true)?>"
id="liasse-check">Vérifier la disponibilité des derniers états financiers au Greffe.</a></p>
</div>
</div>
<?php }?>
@ -84,19 +86,13 @@
<?php foreach ($this->tabResult as $item) { ?>
<?php if (isset($item['ratio'])) { ?>
<tr>
<td><a class="tooltip" title="<?=$item['comment']?>"><?=$item['titre']?><br/><?=$item['stitre']?></a></td>
<td><a class="tooltip-txt" title="<?=$item['comment']?>"><?=$item['titre']?><br/><?=$item['stitre']?></a></td>
<td class="right"><?=$item['entrep']?></td>
<td class="right"><?=$item['secteur']?></td>
<td class="position">
<a class="rTip" href="" rel="<?=$this->url(array(
'controller'=>'finance',
'action'=>'ratiosgraph',
'siret' => $this->siret,
'id' => $this->id,
'ratio' => $item['ratio']
))?>" name="<?=$item['titre']?>">
<?=$item['position']?>
</a>
<a class="tooltip-graph" href="#" data-url="<?=$this->url(array('controller'=>'finance', 'action'=>'ratiosgraph',
'siret'=>$this->siret, 'id' => $this->id, 'ratio' => $item['ratio']))?>" title="<?=$item['titre']?>">
<?=$item['position']?></a>
</td>
</tr>
<?php } else { ?>

View File

@ -3,12 +3,8 @@
<table class="identite">
<tr>
<td width="30">&nbsp;</td>
<td width="200" class="StyleInfoLib">
Num&eacute;ro identifiant Siren
</td>
<td width="350" class="StyleInfoData">
<?=$this->SirenTexte($this->siren);?>
</td>
<td width="200" class="StyleInfoLib">Num&eacute;ro identifiant Siren</td>
<td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren);?></td>
</tr>
<tr>
<td width="30">&nbsp;</td>
@ -38,11 +34,13 @@
</table>
<?php if ( empty($this->AutrePage) ) {?>
<div id="liasse-check-result" class="ui-state-highlight ui-corner-all" style="margin-top: 5px;">
<p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
<div class="ui-widget">
<div id="liasse-check-result" class="ui-state-highlight ui-corner-all" style="margin-top: 5px; padding: .5em .5em 0 .5em;">
<p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
<a title="Cliquez ici pour vérifier l'intégration des éléments financiers"
href="<?=$this->url(array('controller'=>'finance','action'=>'liasseinfos','siren'=>$this->siren), 'default', true)?>"
id="liasse-check">Vérifier la disponibilité des derniers états financiers au Greffe.</a></p>
</div>
</div>
<?php }?>
@ -74,7 +72,7 @@ Aucun bilan disponible.
<?php foreach($this->tabRatio as $ratio => $info) { ?>
<tr>
<td class="head">
<a class="tooltip" title="<?=$info['comment']?>"><?=$info['titre']?></a>
<a class="tooltip-txt" title="<?=$info['comment']?>"><?=$info['titre']?></a>
</td>
<td class="right"><?=$this->tabResult[0]['entrep'][$ratio]?></td>
<td class="right"><small><?=$this->tabResult[0]['entrepEvol'][$ratio]?></small></td>
@ -83,22 +81,12 @@ Aucun bilan disponible.
<td class="right"><?=$this->tabResult[2]['entrep'][$ratio]?></td>
<td class="right"><small><?=$this->tabResult[2]['entrepEvol'][$ratio]?></small></td>
<td>
<?php if ($this->graph): ?>
<a href="<?=$this->url(array(
'controller' => 'finance',
'action' => 'synthese',
'siret' => $this->siret,
'id' => $this->id,
'ratio' => $ratio,
))?>">
<img class="sTip" rel="<?=$this->url(array(
'controller' => 'finance',
'action' => 'synthesegraphevol',
'siret' => $this->siret,
'id' => $this->id,
'ratio' => $ratio,
))?>" title="<?=$info['titre']?>" src="/themes/default/images/finance/char_bar.png" alt="Visionner le graphique">
<?php endif;?>
<?php if ($this->graph){ ?>
<a href="<?=$this->url(array('controller' => 'finance', 'action' => 'synthese', 'siret' => $this->siret,
'id' => $this->id, 'ratio' => $ratio), 'default', true)?>" class="tooltip-graph" data-url="<?=$this->url(array( 'controller' => 'finance', 'action' => 'synthesegraphevol',
'siret' => $this->siret, 'id' => $this->id, 'ratio' => $ratio, ))?>" title="Evolution - <?=$info['titre']?>">
<img src="/themes/default/images/finance/char_bar.png" alt="Visionner le graphique">
<?php }?>
</a>
</td>
@ -108,11 +96,11 @@ Aucun bilan disponible.
</table>
<div class="paragraph">
<?php if ($this->graph):?>
<?php if ($this->graph) {?>
<?=$this->action('synthesegraphcompare', 'finance', null, array('siret'=>$this->siret, 'id'=>$this->id, 'typeBilan'=>$this->typeBilan))?>
<?php else:?>
<?php } else {?>
<b>Les informations sont insuffisantes pour générer le graphique de synthèse.</b>
<?php endif;?>
<?php }?>
</div>
<?php }?>

View File

@ -38,7 +38,7 @@
<button type="button" class="btn btn-primary">Suivi <span class="badge"><?=count($this->Suivi)?></span></button>
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
<span class="sr-only">Suivi</span>
</button>
<ul class="dropdown-menu" role="menu">
<?php if (count($this->Suivi) == 0) {?>
@ -61,7 +61,16 @@
</div>
<div class="container-fluid" id="header-separator">
<div class="col-lg-3 col-md-3"></div>
<div class="col-lg-3 col-md-6"></div>
<div class="col-lg-3 col-md-3"></div>
<div class="row">
<div class="col-lg-3 col-md-3"></div>
<div class="col-lg-6 col-md-6">
<?php if (!empty($this->dateDerMaj)) { ?>
<span class="label label-warning pull-right datemaj">
<?=$this->translate("Mise à jour le")?> <?=$this->dateDerMaj?>
<span><?=$this->datemajTexte?></span>
</span>
<?php }?>
</div>
<div class="col-lg-3 col-md-3"></div>
</div>
</div>

View File

@ -12,15 +12,6 @@
<?php if ( empty($this->AutrePage) ) {?>
<?php if (!empty($this->dateDerMaj)) { ?>
<div class="row">
<span class="label label-warning pull-right datemaj">
<?=$this->translate("Dernière mise à jour le")?> <?=$this->dateDerMaj?>
<span><?=$this->datemajTexte?></span>
</span>
</div>
<?php }?>
<div class="row"><h1 class="titre"><?=$this->translate("Fiche d'identité")?></h1></div>
<?php }?>
<?php

View File

@ -10,7 +10,7 @@ $(document).ready(function()
$(this).parent('form').submit();
});
$('a.tooltip').qtip({
$('a.tooltip-txt').qtip({
style: { width: 500, classes: 'qtip-dark' },
position: { my: 'top left', at: 'bottom left' },
content: { attr: 'title'}
@ -21,28 +21,24 @@ $(document).ready(function()
position: { corner: { target: 'bottomMiddle', tooltip: 'topMiddle' } },
content: { attr: 'title'}
});
$('a.rTip').each(function(){
$(this).qtip({
position: { at: 'right center', my: 'right center', adjust: { x: -20 } },
show: { solo: true },
style: { tip: true, width: 400, classes: 'qtip-light' },
content: {
text: "Chargement...", title: { text: $(this).attr('name') },
ajax: { url: $(this).attr('rel') }
}
});
});
$('a img.sTip').each(function(){
$('.tooltip-graph').each(function(){
$(this).qtip({
position: { at: 'right center', my: 'right center', adjust: { x: -20 } },
position: { my: 'right center', at: 'right center', adjust: {x: -15} },
show: { solo: true },
style: { width: 420, classes: 'qtip-light' },
style: { classes: 'qtip-light' },
content: {
text: "Chargement...",
title: { text: "Evolution - " + $(this).attr('title') },
ajax: { url: $(this).attr('rel') }
title: { text: $(this).attr('title') },
text: function(event, api) {
$.ajax({ url: $(this).data('url') })
.done(function(html) {
api.set('content.text', html)
})
.fail(function(xhr, status, error) {
api.set('content.text', status + ': ' + error)
})
return 'Chargement...';
}
}
});
});