Try to rebase from trunk

This commit is contained in:
Michael RICOIS 2014-02-25 22:26:47 +00:00
commit ac83da9f1e
11 changed files with 472 additions and 651 deletions

View File

@ -979,11 +979,11 @@ class IdentiteController extends Zend_Controller_Action
$siren = substr($this->siret,0,9);
$this->view->headTitle()->prepend('Evènements - Siren '.$siren);
$nbReponses = 50;
//Pagination
$page = $request->getParam('page', 1);
if ($page == 0) $page = 1;
$page = $page - 1;
$position = $page * $nbReponses;
if ( $page <= 0 ) $page = 1;
$nbAffichage = 50;
$position = ($page - 1 ) * $nbAffichage;
$session = new Scores_Session_Entreprise($this->siret, $this->id);
@ -998,15 +998,28 @@ class IdentiteController extends Zend_Controller_Action
$this->view->assign('raisonSociale', $session->getRaisonSociale());
$this->view->assign('exportObjet', $evens);
//Calcul pagination
$nbReponses = count($evens);
$nbReponsesTotal = $infos->nbReponses;
if ($nbReponses < $nbReponsesTotal) {
$totPage = ceil($nbReponsesTotal/$nbReponses);
$curPage = $page + 1;
} else {
$totPage = $curPage = 1;
$pageTotal = ceil( $nbReponsesTotal / $nbAffichage );
$pageCurrent = $page;
$pagePrev = $page - 1;
if ($pagePrev < 1) {
$pagePrev = 1;
}
$this->view->assign('totPage', $totPage);
$this->view->assign('curPage', $curPage);
$pageNext = $page + 1;
if( $pageNext > $pageTotal ) {
$pageNext = $pageTotal;
}
} else {
$pageTotal = $pageCurrent = 1;
}
$this->view->assign('PageTotal', $pageTotal);
$this->view->assign('PagePrev', $pagePrev);
$this->view->assign('PageNext', $pageNext);
$this->view->assign('PageCurrent', $pageCurrent);
$this->view->assign('nbReponses', empty($nbReponses) ? 0 : $nbReponses);
$this->view->assign('nbReponsesTotal', empty($nbReponsesTotal) ? 0 : $nbReponsesTotal);
}

View File

@ -411,10 +411,11 @@ class RechercheController extends Zend_Controller_Action
$user = new Scores_Utilisateur();
$this->view->assign('IDENTITE', $user->checkPerm('IDENTITE'));
//Pagination
$page = $request->getParam('page', 1);
if ($page==0) $page = 1;
$page = $page-1;
$position = $page*$user->getNbRep();
if ( $page <= 0 ) $page = 1;
$nbAffichage = $user->getNbRep();
$position = ($page - 1 ) * $nbAffichage;
require_once 'Scores/WsScores.php';
$ws = new WsScores();
@ -584,15 +585,6 @@ class RechercheController extends Zend_Controller_Action
}
$criteresLien = $this->view->url($params, null, true);
$info = $reponse->info;
$nbReponses = $reponse->nbReponses;
$nbReponsesTotal = $reponse->nbReponsesTotal;
if ($nbReponses < $nbReponsesTotal) {
$totPage = ceil($nbReponsesTotal/$user->getNbRep());
$curPage = $page+1;
} else {
$totPage = $curPage = 1;
}
$liste = array();
if (count($etabs)>0) {
@ -793,15 +785,38 @@ class RechercheController extends Zend_Controller_Action
$this->view->assign('blockDirToEntreprise', false);
}
$this->view->assign('token', $token);
$this->view->assign('liste', $liste);
$this->view->assign('totPage', $totPage);
$this->view->assign('curPage', $curPage);
//Calcul pagination
$nbReponses = $reponse->nbReponses;
$nbReponsesTotal = $reponse->nbReponsesTotal;
if ($nbReponses < $nbReponsesTotal) {
$pageTotal = ceil( $nbReponsesTotal / $nbAffichage );
$pageCurrent = $page;
$pagePrev = $page - 1;
if ($pagePrev < 1) {
$pagePrev = 1;
}
$pageNext = $page + 1;
if( $pageNext > $pageTotal ) {
$pageNext = $pageTotal;
}
} else {
$pageTotal = $pageCurrent = 1;
}
$this->view->assign('PageTotal', $pageTotal);
$this->view->assign('PagePrev', $pagePrev);
$this->view->assign('PageNext', $pageNext);
$this->view->assign('PageCurrent', $pageCurrent);
$this->view->assign('nbReponses', empty($nbReponses) ? 0 : $nbReponses);
$this->view->assign('nbReponsesTotal', empty($nbReponsesTotal) ? 0 : $nbReponsesTotal);
$this->view->assign('token', $token);
$this->view->assign('criteresTexte', $criteresTexte);
$this->view->assign('criteresLien', $criteresLien);
$this->view->assign('info', $info);
$this->view->assign('info', $reponse->info);
}
}

View File

@ -269,11 +269,11 @@ class SurveillanceController extends Zend_Controller_Action
$request = $this->getRequest();
//Pagination
$page = $request->getParam('page', 1);
if ( $page == 0 ) $page = 1;
$page = $page - 1;
if ( $page <= 0 ) $page = 1;
$nbAffichage = 50;
$position = $page * $nbAffichage;
$position = ($page - 1 ) * $nbAffichage;
$source = $request->getParam('source', '');
@ -366,17 +366,32 @@ class SurveillanceController extends Zend_Controller_Action
//Calcul pagination
$nbReponses = $infos->nbReponses;
$nbSurveillances = $infos->nbReponsesTotal;
$totPage = ceil($nbSurveillances/$nbAffichage);
$curPage = ceil($position/$nbAffichage)+1;
$nbReponsesTotal = $infos->nbReponsesTotal;
if ($nbReponses < $nbReponsesTotal) {
$pageTotal = ceil( $nbReponsesTotal / $nbAffichage );
$pageCurrent = $page;
$pagePrev = $page - 1;
if ($pagePrev < 1) {
$pagePrev = 1;
}
$pageNext = $page + 1;
if( $pageNext > $pageTotal ) {
$pageNext = $pageTotal;
}
} else {
$pageTotal = $pageCurrent = 1;
}
$this->view->assign('PageTotal', $pageTotal);
$this->view->assign('PagePrev', $pagePrev);
$this->view->assign('PageNext', $pageNext);
$this->view->assign('PageCurrent', $pageCurrent);
$this->view->assign('nbReponses', empty($nbReponses) ? 0 : $nbReponses);
$this->view->assign('nbSurveillances', $nbReponsesTotal);
$this->view->assign('source', $source);
$this->view->assign('selectTri', $selectTri);
$this->view->assign('listSources', $permSource);
$this->view->assign('nbReponses', $nbReponses);
$this->view->assign('nbSurveillances', $nbSurveillances);
$this->view->assign('totPage', $totPage);
$this->view->assign('curPage', $curPage);
$this->view->assign('surveillances', $listTrier);
$this->view->assign('source', $source);
}
@ -397,11 +412,11 @@ class SurveillanceController extends Zend_Controller_Action
$request = $this->getRequest();
//Pagination
$page = $request->getParam('page', 1);
if ( $page == 0 ) $page = 1;
$page = $page - 1;
$nbAffichage = 100;
$position = $page * $nbAffichage;
if ( $page <= 0 ) $page = 1;
$nbAffichage = 50;
$position = ($page - 1 ) * $nbAffichage;
$siren = $request->getParam('siren', null);
if ( $siren == 'Siren' ) { $siren = null; }
@ -567,14 +582,29 @@ class SurveillanceController extends Zend_Controller_Action
//Calcul pagination
$nbReponses = $infos->nbReponses;
$nbSurveillances = $infos->nbReponsesTotal;
$totPage = ceil($nbSurveillances/$nbAffichage);
$curPage = ceil($position/$nbAffichage)+1;
$nbReponsesTotal = $infos->nbReponsesTotal;
if ($nbReponses < $nbReponsesTotal) {
$pageTotal = ceil( $nbReponsesTotal / $nbAffichage );
$pageCurrent = $page;
$pagePrev = $page - 1;
if ($pagePrev < 1) {
$pagePrev = 1;
}
$pageNext = $page + 1;
if( $pageNext > $pageTotal ) {
$pageNext = $pageTotal;
}
} else {
$pageTotal = $pageCurrent = 1;
}
$this->view->assign('PageTotal', $pageTotal);
$this->view->assign('PagePrev', $pagePrev);
$this->view->assign('PageNext', $pageNext);
$this->view->assign('PageCurrent', $pageCurrent);
$this->view->assign('nbReponses', empty($nbReponses) ? 0 : $nbReponses);
$this->view->assign('nbSurveillances', $nbReponsesTotal);
$this->view->assign('nbReponses', $nbReponses);
$this->view->assign('nbSurveillances', $nbSurveillances);
$this->view->assign('totPage', $totPage);
$this->view->assign('curPage', $curPage);
$this->view->assign('portefeuille',$tabResult);
}

View File

@ -76,14 +76,14 @@
</table>
</div>
<?php if ($this->totPage>1) {?>
<?php if ($this->PageTotal>1) {?>
<div class="paragraph">
<div class="pagination clearfix">
<a class="first" href="<?=$this->url(array('page'=>1))?>">&laquo;</a>
<a class="previous" href="<?=$this->url(array('page'=>$this->curPage-1))?>">&lsaquo;</a>
<span>Page <?=$this->curPage?>/<?=$this->totPage?></span>
<a class="next" href="<?=$this->url(array('page'=>$this->curPage+1))?>">&rsaquo;</a>
<a class="last" href="<?=$this->url(array('page'=>$this->totPage))?>">&raquo;</a>
<a class="previous" href="<?=$this->url(array('page'=>$this->PagePrev))?>">&lsaquo;</a>
<span>Page <?=$this->PageCurrent?>/<?=$this->PageTotal?></span>
<a class="next" href="<?=$this->url(array('page'=>$this->PageNext))?>">&rsaquo;</a>
<a class="last" href="<?=$this->url(array('page'=>$this->PageTotal))?>">&raquo;</a>
</div>
</div>
<?php }?>

View File

@ -6,9 +6,9 @@
<?=$this->nbReponsesTotal?> r&eacute;ponse<?php if ($this->nbReponsesTotal>1){?>s<?php }?>
avec les crit&egrave;res "<a href="<?php echo $this->criteresLien?>">
<?=$this->criteresTexte?></a>".
<?php if ($this->totPage!=1) {?>
<?php if ($this->PageTotal!=1) {?>
<?=$this->nbReponses?> r&eacute;sultats affich&eacute;s.
Page <?=$this->curPage.'/'.$this->totPage.'.';?>
Page <?=$this->PageCurrent.'/'.$this->PageTotal.'.';?>
<?php }?>
<?php if ($this->filtres) { ?>
@ -27,9 +27,7 @@ $('select[name=filtre]').change(function(e){
</p>
</div>
<?php
if (!empty($this->info)) {
?>
<?php if (!empty($this->info)) { ?>
<div style="margin:5px; padding: 0pt 0.7em;" class="ui-state-highlight ui-corner-all">
<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-info"></span>
<?=$this->info?></p>
@ -73,26 +71,19 @@ if (!empty($this->info)) {
<?php }?>
</ol>
<div id="recherche-page">
<?php if ($this->curPage>1) { ?>
<a href="<?=$this->url(array('action'=>'liste', 'page'=>$this->curPage-1, 'token'=> $this->token))?>" title="Page précédente...">
<img src="/themes/default/images/boutton_precedent_off.gif" />
</a>
<?
}
if ($this->curPage!=$this->totPage) {
?>
<span>Page <?=$this->curPage?>/<?=$this->totPage?></span>
<?php
}
if ($this->curPage<$this->totPage) {
?>
<a href="<?=$this->url(array('action'=>'liste', 'page'=>$this->curPage+1, 'token'=> $this->token))?>" title="Page suivante...">
<img src="/themes/default/images/boutton_suivant_off.gif" />
</a>
<?php }?>
<?php if ($this->PageTotal>1) {?>
<div class="paragraph">
<div class="pagination clearfix">
<a class="first" href="<?=$this->url(array('page'=>1, 'token'=> $this->token))?>">&laquo;</a>
<a class="previous" href="<?=$this->url(array('page'=>$this->PagePrev, 'token'=> $this->token))?>">&lsaquo;</a>
<span>Page <?=$this->PageCurrent?>/<?=$this->PageTotal?></span>
<a class="next" href="<?=$this->url(array('page'=>$this->PageNext, 'token'=> $this->token))?>">&rsaquo;</a>
<a class="last" href="<?=$this->url(array('page'=>$this->PageTotal, 'token'=> $this->token))?>">&raquo;</a>
</div>
<br/>
</div>
<?php }?>
<div class="paragraph">
<?php if ($this->rechCsv) { ?>

View File

@ -65,14 +65,14 @@ par
<h2>Liste des surveillances</h2>
<?php if ($this->totPage>1) {?>
<?php if ($this->PageTotal>1) {?>
<div class="paragraph">
<div class="pagination clearfix">
<a class="first" href="<?=$this->url(array('page'=>1))?>">&laquo;</a>
<a class="previous" href="<?=$this->url(array('page'=>$this->curPage-1))?>">&lsaquo;</a>
<span>Page <?=$this->curPage?>/<?=$this->totPage?></span>
<a class="next" href="<?=$this->url(array('page'=>$this->curPage+1))?>">&rsaquo;</a>
<a class="last" href="<?=$this->url(array('page'=>$this->totPage))?>">&raquo;</a>
<a class="first" href="<?=$this->url(array('page'=>1, 'token'=> $this->token))?>">&laquo;</a>
<a class="previous" href="<?=$this->url(array('page'=>$this->PagePrev, 'token'=> $this->token))?>">&lsaquo;</a>
<span>Page <?=$this->PageCurrent?>/<?=$this->PageTotal?></span>
<a class="next" href="<?=$this->url(array('page'=>$this->PageNext, 'token'=> $this->token))?>">&rsaquo;</a>
<a class="last" href="<?=$this->url(array('page'=>$this->PageTotal, 'token'=> $this->token))?>">&raquo;</a>
</div>
</div>
<?php }?>
@ -223,14 +223,14 @@ par
</table>
</div>
<?php if ($this->totPage>1) {?>
<?php if ($this->PageTotal>1) {?>
<div class="paragraph">
<div class="pagination clearfix">
<a class="first" href="<?=$this->url(array('page'=>1))?>">&laquo;</a>
<a class="previous" href="<?=$this->url(array('page'=>$this->curPage))?>">&lsaquo;</a>
<span>Page <?=$this->curPage?>/<?=$this->totPage?></span>
<a class="next" href="<?=$this->url(array('page'=>$this->curPage+1))?>">&rsaquo;</a>
<a class="last" href="<?=$this->url(array('page'=>$this->totPage))?>">&raquo;</a>
<a class="previous" href="<?=$this->url(array('page'=>$this->PagePrev))?>">&lsaquo;</a>
<span>Page <?=$this->PageCurrent?>/<?=$this->PageTotal?></span>
<a class="next" href="<?=$this->url(array('page'=>$this->PageNext))?>">&rsaquo;</a>
<a class="last" href="<?=$this->url(array('page'=>$this->PageTotal))?>">&raquo;</a>
</div>
</div>
<?php }?>

View File

@ -133,14 +133,14 @@ Aucune surveillance Score.
<?php }?>
</div>
<?php if ($this->totPage>1) {?>
<?php if ($this->PageTotal>1) {?>
<div class="paragraph">
<div class="pagination clearfix">
<a class="first" href="<?=$this->url(array('page'=>1))?>">&laquo;</a>
<a class="previous" href="<?=$this->url(array('page'=>$this->curPage-1))?>">&lsaquo;</a>
<span>Page <?=$this->curPage?>/<?=$this->totPage?></span>
<a class="next" href="<?=$this->url(array('page'=>$this->curPage+1))?>">&rsaquo;</a>
<a class="last" href="<?=$this->url(array('page'=>$this->totPage))?>">&raquo;</a>
<a class="previous" href="<?=$this->url(array('page'=>$this->PagePrev))?>">&lsaquo;</a>
<span>Page <?=$this->PageCurrent?>/<?=$this->PageTotal?></span>
<a class="next" href="<?=$this->url(array('page'=>$this->PageNext))?>">&rsaquo;</a>
<a class="last" href="<?=$this->url(array('page'=>$this->PageTotal))?>">&raquo;</a>
</div>
</div>
<?php }?>

View File

@ -16,36 +16,23 @@
font-size:13px;
}
.title {
.compteAnnuels .title {
font-size:16px;
color: #2599E7;
color:#00008C;
font-weight:800;
}
.minTitle {
background: none repeat scroll 0 0 #B9C9FE;
border: 1px solid #FFF;
color: #039;
font-size: 13px;
font-weight: 800;
padding: 4px;
}
.compteAnnuels .center {
text-align:center;
}
.compteAnnuels .bilansTAB td {
font-size: 11px;
!
important
font-size:11px; !important
}
#AvisDeCredit {
margin-left: 19px;
width:97%;
}
#AvisDeCredit td {
font-size:13px;
}
@ -53,35 +40,28 @@
#AvisDeCredit .float {
float:right;
}
#AvisDeCredit hr {
border:1px dotted silver;
}
#AvisDeCredit div {
padding:0.7em;
}
#AvisDeCredit div span {
float: left;
margin-right: 0.3em;
float: left; margin-right: 0.3em;
}
#ComparisonValeurs span {
font-size:16px;
color: #2599E7;
color:#00008C;
font-weight:800;
}
#ComparisonValeurs .Variation {
width:85px;
text-align:right;
}
#ComparaisonValeurs hr {
border:1px dotted silver;
}
#ComparisonValeurs div {
padding:0.7em;
}
@ -90,154 +70,156 @@
text-align:center;
}
#ComparaisonValeurs .align {align ="right"
#ComparaisonValeurs .align {
align="right"
}
#sommaire {
#sommaire
{
margin:5px;
}
#sommaire fieldset {
#sommaire fieldset
{
padding: 10px;
border:1px dotted silver;
padding-bottom: 70px;
}
#sommaire fieldset legend {
#sommaire fieldset legend
{
font-size:25px;
font-weight: bold;
color:#000099;
}
#sommaire h3 {
#sommaire h3
{
font-size:25px;
font-weight: bold;
text-align: right;
margin-right: 10px;
}
#sommaire li {
#sommaire li
{
font-size:15px;
list-style: none;
font-weight: 800;
margin-top: 10px;
}
#sommaire li a {
#sommaire li a
{
color:#000099;
cursor: pointer;
}
#sommaire li a:hover {
#sommaire li a:hover
{
color:#9C093A;
}
#sommaire span a:hover {
#sommaire span a:hover
{
color:#000099;
}
#sommaire span a {
#sommaire span a
{
color:#9C093A;
cursor: pointer;
}
#comportementPaiement tr td {
#comportementPaiement tr td
{
padding:5px;
}
.colorTr {
.colorTr
{
background-color: #EDEEF7;
}
/** Giant rapport **/
.red {
#ComparisonValeurs table
{
font-size:13px;
margin-left: 19px;
}
.red
{
font-size:11px;
background-color:#FFE8E8;
}
.green {
.green
{
font-size:11px;
background-color:#E8FFE8;
}
#ComparisonValeurs table tr:hover {
#ComparisonValeurs table tr:hover
{
background-color: #E0E4F8;
}
.hoverTr tr:hover {
.hoverTr tr:hover
{
background-color: #E0E4F8;
cursor: default;
}
.FR {
background-image: url('/themes/default/images/giant/cartes/fr.png');
background-repeat: no-repeat;
background-position: top right;
}
.FR{background-image: url('/themes/default/images/giant/cartes/fr.png');background-repeat: no-repeat;background-position: top right;}
.NL{ background-image: url('/themes/default/images/giant/cartes/nl.JPG');background-repeat: no-repeat;background-position: top right;}
.BE{ background-image: url('/themes/default/images/giant/cartes/be.JPG');background-repeat: no-repeat;background-position: top right;}
.UK{ background-image: url('/themes/default/images/giant/cartes/uk.JPG');background-repeat: no-repeat;background-position: top right;}
.ES{ background-image: url('/themes/default/images/giant/cartes/es.JPG');background-repeat: no-repeat;background-position: top right;}
.NL {
background-image: url('/themes/default/images/giant/cartes/nl.JPG');
background-repeat: no-repeat;
background-position: top right;
}
.BE {
background-image: url('/themes/default/images/giant/cartes/be.JPG');
background-repeat: no-repeat;
background-position: top right;
}
.UK {
background-image: url('/themes/default/images/giant/cartes/uk.JPG');
background-repeat: no-repeat;
background-position: top right;
}
.ES {
background-image: url('/themes/default/images/giant/cartes/es.JPG');
background-repeat: no-repeat;
background-position: top right;
}
#carte {
#carte
{
width:660px;
background-position: right top;
background-repeat: no-repeat;
background-color: #fcfdfe;
}
/** Giant Search **/
#info td {
#info td
{
padding:2px;
}
.giant-search {
.giant-search
{
font-family: Arial,Helvetica,sans-serif;
color: #535353;
}
.giant-search #Paginator {
.giant-search #Paginator
{
color:black;
}
.giant-search ol {
.giant-search ol
{
text-align:left;
margin:10px;
padding:0 20px;
}
.giant-search #Paginator table {
.giant-search #Paginator table
{
width:130px;
}
.giant-search #contact {
.giant-search #contact
{
padding-left:5px;
}
#inDebug {
#inDebug
{
float:left;
}
#debug {
#debug
{
background-color:#FFFFCC;
padding:10px;
border:1px solid silver;
@ -245,7 +227,8 @@
overflow:auto;
}
#debug_menu {
#debug_menu
{
float:left;
background-color:#FFFFCC;
border:1px solid silver;
@ -255,169 +238,19 @@
padding-top:9px;
}
#debug_menu:hover {
#debug_menu:hover
{
background-color:#FFFF99;
cursor:pointer;
}
.hide {
.hide
{
background-color: silver;
height: 455px;
position: absolute;
top:2%;
left:35%;
width: 691px;
opacity:0.3;
}
.hide_monitor {
background-color: #C0C0C0;
height: 497px;
position: absolute;
top: 0%;
width: 714px;
margin-left: -14px;
opacity: 0.3;
}
.radio_but {
width: 295px;
}
.lang_img {
display: none;
float: right;
margin-left: 3px;
}
.lang_select {
float: right;
margin-left: 3px;
}
.brsr {
border-style: solid;
border-width: 1px;
border-color: red;
}
.all_select {
width: 140px;
}
.acord {
width: 671px;
margin: 0 auto;
}
.gen_div {
width: 600px;
margin-left: 41px;
}
.left_div {
float: left;
width: 300px;
padding-bottom: 15px;
}
.right_div {
float: left;
width: 300px;
padding-bottom: 15px;
}
.radius {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
-khtml-border-radius: 4px;
-o-border-radius: 4px;
-ms-border-radius: 4px;
-icab-border-radius: 4px;
border-radius: 4px;
}
.monitor_but {
width: 448px;
}
.monitor_but a {
margin: 7px;
float: left;
}
.monitor_resp {
height: 16px;
clear: both;
margin: 5px;
padding: 5px;
background: #eee;
width: 601px;
}
.dialog-form {
display: none;
}
.mon_type {
width: 140px;
}
.testSearch a:hover {
text-decoration: underline;
}
.testSearch a {
color: #008000;
font-style: italic;
}
.line {
background: none repeat scroll 0 0 #E8EDFF;
border: 1px solid #FFF;
padding: 4px;
}
.tooltipFont {
color: black;
font-size: 12px;
}
#giant_synthese .head {
font-weight: bold;
}
#giant_synthese th {
background: none repeat scroll 0 0 #B9C9FE;
border: 1px solid #FFFFFF;
color: #003399;
font-size: 13px;
padding: 4px;
}
#giant_synthese td.right {
text-align: right;
}
#giant_synthese {
border-collapse: collapse;
clear: both;
font-size: 12px;
margin: 10px 0px 0;
padding: 2px;
text-align: left;
width: 100%;
font-family: arial, sans-serif;
font-size: 11px;
}
#giant_synthese td {
background: none repeat scroll 0 0 #E8EDFF;
border: 1px solid #FFFFFF;
color: #666699;
padding: 4px;
}
#giant_synthese tr:hover td {
background: none repeat scroll 0 0 #D0DAFD;
}

View File

@ -1,26 +1,7 @@
/*! normalize.css v3.0.0 | MIT License | git.io/normalize */
/*! normalize.css v2.0.1 */
/**
* 1. Set default font family to sans-serif.
* 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom.
*/
html {
font-family: sans-serif; /* 1 */
-ms-text-size-adjust: 100%; /* 2 */
-webkit-text-size-adjust: 100%; /* 2 */
}
/**
* Remove default margin.
*/
body {
margin: 0;
}
/* HTML5 display definitions
/* ==========================================================================
HTML5 display definitions
========================================================================== */
/**
@ -43,16 +24,13 @@ summary {
}
/**
* 1. Correct `inline-block` display not defined in IE 8/9.
* 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
* Correct `inline-block` display not defined in IE 8/9.
*/
audio,
canvas,
progress,
video {
display: inline-block; /* 1 */
vertical-align: baseline; /* 2 */
display: inline-block;
}
/**
@ -66,24 +44,47 @@ audio:not([controls]) {
}
/**
* Address `[hidden]` styling not present in IE 8/9.
* Hide the `template` element in IE, Safari, and Firefox < 22.
* Address styling not present in IE 8/9.
*/
[hidden],
template {
[hidden] {
display: none;
}
/* Links
/* ==========================================================================
Base
========================================================================== */
/**
* Remove the gray background color from active links in IE 10.
* 1. Set default font family to sans-serif.
* 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom.
*/
a {
background: transparent;
html {
font-family: sans-serif; /* 1 */
-webkit-text-size-adjust: 100%; /* 2 */
-ms-text-size-adjust: 100%; /* 2 */
}
/**
* Remove default margin.
*/
body {
margin: 0;
}
/* ==========================================================================
Links
========================================================================== */
/**
* Address `outline` inconsistency between Chrome and other browsers.
*/
a:focus {
outline: thin dotted;
}
/**
@ -95,9 +96,19 @@ a:hover {
outline: 0;
}
/* Text-level semantics
/* ==========================================================================
Typography
========================================================================== */
/**
* Address variable `h1` font size within `section` and `article` contexts in
* Firefox 4+, Safari 5, and Chrome.
*/
h1 {
font-size: 2em;
}
/**
* Address styling not present in IE 8/9, Safari 5, and Chrome.
*/
@ -123,16 +134,6 @@ dfn {
font-style: italic;
}
/**
* Address variable `h1` font-size and margin within `section` and `article`
* contexts in Firefox 4+, Safari 5, and Chrome.
*/
h1 {
font-size: 2em;
margin: 0.67em 0;
}
/**
* Address styling not present in IE 8/9.
*/
@ -142,6 +143,36 @@ mark {
color: #000;
}
/**
* Correct font family set oddly in Safari 5 and Chrome.
*/
code,
kbd,
pre,
samp {
font-family: monospace, serif;
font-size: 1em;
}
/**
* Improve readability of pre-formatted text in all browsers.
*/
pre {
white-space: pre;
white-space: pre-wrap;
word-wrap: break-word;
}
/**
* Set consistent quote types.
*/
q {
quotes: "\201C" "\201D" "\2018" "\2019";
}
/**
* Address inconsistent and variable font size in all browsers.
*/
@ -170,7 +201,8 @@ sub {
bottom: -0.25em;
}
/* Embedded content
/* ==========================================================================
Embedded content
========================================================================== */
/**
@ -189,7 +221,8 @@ svg:not(:root) {
overflow: hidden;
}
/* Grouping content
/* ==========================================================================
Figures
========================================================================== */
/**
@ -197,82 +230,56 @@ svg:not(:root) {
*/
figure {
margin: 1em 40px;
margin: 0;
}
/**
* Address differences between Firefox and other browsers.
*/
hr {
-moz-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
/**
* Contain overflow in all browsers.
*/
pre {
overflow: auto;
}
/**
* Address odd `em`-unit font size rendering in all browsers.
*/
code,
kbd,
pre,
samp {
font-family: monospace, monospace;
font-size: 1em;
}
/* Forms
/* ==========================================================================
Forms
========================================================================== */
/**
* Known limitation: by default, Chrome and Safari on OS X allow very limited
* styling of `select`, unless a `border` property is set.
* Define consistent border, margin, and padding.
*/
fieldset {
border: 1px solid #c0c0c0;
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
}
/**
* 1. Correct color not being inherited.
* Known issue: affects color of disabled elements.
* 2. Correct font properties not being inherited.
* 1. Correct `color` not being inherited in IE 8/9.
* 2. Remove padding so people aren't caught out if they zero out fieldsets.
*/
legend {
border: 0; /* 1 */
padding: 0; /* 2 */
}
/**
* 1. Correct font family not being inherited in all browsers.
* 2. Correct font size not being inherited in all browsers.
* 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
*/
button,
input,
optgroup,
select,
textarea {
color: inherit; /* 1 */
font: inherit; /* 2 */
font-family: inherit; /* 1 */
font-size: 100%; /* 2 */
margin: 0; /* 3 */
}
/**
* Address `overflow` set to `hidden` in IE 8/9/10.
*/
button {
overflow: visible;
}
/**
* Address inconsistent `text-transform` inheritance for `button` and `select`.
* All other form control elements do not inherit `text-transform` values.
* Correct `button` style inheritance in Firefox, IE 8+, and Opera
* Correct `select` style inheritance in Firefox.
* Address Firefox 4+ setting `line-height` on `input` using `!important` in
* the UA stylesheet.
*/
button,
select {
text-transform: none;
input {
line-height: normal;
}
/**
@ -301,30 +308,8 @@ html input[disabled] {
}
/**
* Remove inner padding and border in Firefox 4+.
*/
button::-moz-focus-inner,
input::-moz-focus-inner {
border: 0;
padding: 0;
}
/**
* Address Firefox 4+ setting `line-height` on `input` using `!important` in
* the UA stylesheet.
*/
input {
line-height: normal;
}
/**
* It's recommended that you don't attempt to style these elements.
* Firefox's implementation doesn't respect box-sizing, padding, or width.
*
* 1. Address box sizing set to `content-box` in IE 8/9/10.
* 2. Remove excess padding in IE 8/9/10.
* 1. Address box sizing set to `content-box` in IE 8/9.
* 2. Remove excess padding in IE 8/9.
*/
input[type="checkbox"],
@ -333,17 +318,6 @@ input[type="radio"] {
padding: 0; /* 2 */
}
/**
* Fix the cursor style for Chrome's increment/decrement buttons. For certain
* `font-size` values of the `input`, it causes the cursor style of the
* decrement button to change from `default` to `text`.
*/
input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
height: auto;
}
/**
* 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
* 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
@ -358,9 +332,8 @@ input[type="search"] {
}
/**
* Remove inner padding and search cancel button in Safari and Chrome on OS X.
* Safari (but not Chrome) clips the cancel button when the search input has
* padding (and `textfield` appearance).
* Remove inner padding and search cancel button in Safari 5 and Chrome
* on OS X.
*/
input[type="search"]::-webkit-search-cancel-button,
@ -369,43 +342,27 @@ input[type="search"]::-webkit-search-decoration {
}
/**
* Define consistent border, margin, and padding.
* Remove inner padding and border in Firefox 4+.
*/
fieldset {
border: 1px solid #c0c0c0;
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
button::-moz-focus-inner,
input::-moz-focus-inner {
border: 0;
padding: 0;
}
/**
* 1. Correct `color` not being inherited in IE 8/9.
* 2. Remove padding so people aren't caught out if they zero out fieldsets.
*/
legend {
border: 0; /* 1 */
padding: 0; /* 2 */
}
/**
* Remove default vertical scrollbar in IE 8/9.
* 1. Remove default vertical scrollbar in IE 8/9.
* 2. Improve readability and alignment in all browsers.
*/
textarea {
overflow: auto;
overflow: auto; /* 1 */
vertical-align: top; /* 2 */
}
/**
* Don't inherit the `font-weight` (applied by a rule above).
* NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
*/
optgroup {
font-weight: bold;
}
/* Tables
/* ==========================================================================
Tables
========================================================================== */
/**
@ -417,33 +374,25 @@ table {
border-spacing: 0;
}
td,
th {
padding: 0;
}
/* Main
----------------------------------*/
body {background-color:#bebebe;font-family: Verdana, Arial, sans-serif;font-size:11px;text-align:center; /* pour corriger le bug de centrage IE */ }
body{font-family: Verdana, Arial, sans-serif;font-size: 11px;text-align: center; /* pour corriger le bug de centrage IE */ }
#global {width:900px; margin:0 auto; text-align:left;}
#content {float:right;clear:both;width:680px;padding:0;margin:0;padding-top:20px;}
#content {padding:0;margin:0;}
#center {background-color:#fff;padding:5px 0;}
div.paragraph {margin:5px;padding:5px;}
#footer {clear:both;text-align:center;margin-top:15px;}
#footer p {font:0.9em Arial, Helvetica, sans-serif; }
#center h1 {clear:both;margin:5px;padding:5px;background:#606060;color:#ffffff;font:600 1.4em Arial, Verdana, Sans-serif;letter-spacing:1px;line-height:1.2em;}
#center h2 {clear:both; margin:5px; padding:5px;background:#00008c;color:#ffffff;font:bold 1.2em Arial, Verdana, Sans-serif; }
div.paragraph {margin:5px;padding:5px;}
.clearfix:after {content: ".";display: block;height: 0;clear: both;visibility: hidden;zoom:1;}
a:link {color: #9c093a; text-decoration:none;}
a:visited {color: #0000CC; text-decoration:none;}
a:hover {color: #000066; text-decoration:none;}
.StyleInfoLib {font-family: Arial, Helvetica, sans-serif;font-size:11px;font-weight:bold;color:#535353; vertical-align:top;line-height:16px;}
.StyleInfoData {font-family: Arial, Helvetica, sans-serif;font-size:11px;color:#535353;line-height:16px;}
.StyleInfoDataActif {font-family: Arial, Helvetica, sans-serif;font-size:11px;line-height:16px;}
#center h1 {clear:both;margin:5px;padding:5px; background:#606060; color:#ffffff;font:600 1.4em Arial, Verdana, Sans-serif; line-height:1.2em;}
#center h2 {clear:both; margin:5px; padding:5px; background:#00008c; color:#ffffff; font:bold 1.2em Arial, Verdana, Sans-serif; }
.StyleInfoLib {font-family: Arial, Helvetica, sans-serif;font-size: 11px;font-weight: bold;color:#535353;}
.StyleInfoData {font-family: Arial, Helvetica, sans-serif;font-size: 11px;color:#535353;}
.StyleInfoDataActif {font-family: Arial, Helvetica, sans-serif;font-size: 11px;}
table.identite {border-collapse:separate;border-spacing:4px;}
table.data {width:100%;}
table.data td {border:1px solid #ccc; padding:5px;}
table.data th {border:1px solid #ccc; padding:5px;}
.confidentiel {border-top:1px solid; padding-top:5px; font-style:italic; font-size:9px;}
.ui-dialog {text-align:left;}
.ui-widget {font-size: 1em;}
@ -456,7 +405,7 @@ img {vertical-align:middle;}
/* Menu
----------------------------------*/
div#menu {position: absolute;width:200px;}
div#menu {display:none;}
div#menu .ui-widget {font-family:Arial, Sans-serif;font-size:12px;}
div#menu ul.navigation li {list-style-type:none;}
div#menu ul.navigation li a {display:block;padding:0 20px;text-decoration:none;font-weight:bold;color:#fff;height:25px;line-height:25px;background:#808080 url(/themes/default/images/menu/title.gif);}
@ -478,13 +427,14 @@ div#menu div.icones {text-align:center;margin-top:5px;}
/* Recherche
----------------------------------*/
/*#center{padding:5px;}*/
#center-recherche{text-align:center; padding:0;}
#recherche{margin:78px auto 20px auto;}
#recherche h3{color:#ffffff; font-size:medium; font-weight:bold;}
#recherche-info{text-align:center;}
#recherche-page{text-align:center;}
#recherche-page img{vertical-align:middle;}
form.recherche{padding:0; text-align:left;}
form.recherche{padding:20px 0; text-align:left;}
form.recherche label {clear:both;float:left;width:250px;line-height:20px;font-weight:bold;text-align:right;padding-right:5px;}
form.recherche div.field {float:left;}
form.recherche div.row {clear:both;padding:5px 0;}
@ -540,7 +490,6 @@ a.AncienSiege { background-color: #4D90FE; border: 1px solid #3079ED; color: #FF
#ratio {clear: both;font-family: "Lucida Sans Unicode","Lucida Grande",Sans-Serif;font-size: 12px;margin: 10px 0 0;text-align: left;width: 100%;}
#LiasseTable {border-collapse: collapse;color:#606060;margin:5px 0 10px 0;}
#LiasseTable td {font-size:11px;font-family: arial,sans-serif;border:1px solid silver;padding:2px;}
#LiasseTable td.amount-value {min-width:70px;}
#liasseForm th {color:#606060;font-weight:bold;}
#liasseForm {margin-left:30px;}
#liasseForm td {color:#606060;}
@ -569,9 +518,10 @@ ul.tabs li a.active {background-color:#ffffff;color:#282e32;border:1px solid #46
/* Géolocalisation
----------------------------------*/
#infogeo_txt {float:left;width:320px;padding:10px 0;}
#infogeo_photo {float:left;margin:0;padding:0;width:320px;}
#legende-photo {margin:5px 0; padding:10px;border:1px solid #0000ff;color:#0000ff;}
#infogeo_txt {float:left;width:250px;padding:10px 0;}
#infogeo_photo {float:left;margin:0;padding:0;width:340px;}
#legende-photo {display:none;width:278px;margin:5px 0 10px 0;padding:10px;border:1px solid #0000ff;color:#0000ff;}
#pp-cb-thumb {display:none;}
#pp-cb-thumb div.left {float:left;position:relative;width:256px;height:128px;overflow:hidden;}
#pp-cb-thumb div.right {float:left;position:relative;width:44px;height:128px;overflow:hidden;}
#pp-cb-thumb div.left img{position:relative;left:-256px;top:-140px;}
@ -686,13 +636,13 @@ input[type="checkbox"] {margin:0 5px 0 5px; border:0;}
.submit {text-align:center;}
.noborder {border:none;}
#message {margin:10px 0 10px 30px;}
table.greffe {width:100%;border-collapse:collapse;}
table.greffe {width:95%; margin:5px 10px;border-collapse:collapse;}
table.greffe th {border:1px solid #000000;padding:8px 4px 8px 4px;background-color:#eeeeee;text-align: center; }
table.greffe td.date {text-align:center;background-color:#2b2b8b;color:white;font-weight:bold;width:90px;}
table.greffe td {padding:8px 4px 8px 4px;border:1px solid #000000;border-bottom: 1px dashed; vertical-align:top;}
table.greffe td.decision {min-width:150px;}
table.greffe td.type {min-width:250px;}
table.greffe td.saisie {border-top: 1px dashed;}
table.greffe .date { text-align: center; }
table.greffe td.date { background-color:#2b2b8b;color:white;font-weight:bold;}
table.greffe td { border:1px solid #000000;padding:8px 4px 8px 4px;}
table.greffe td.decision { width:50%; }
table.greffe td.type {text-align:center;}
/* Kbis
----------------------------------*/
@ -705,14 +655,3 @@ table.greffe td.saisie {border-top: 1px dashed;}
/* text off bar */
#progressbar div.text {position:absolute;width:100%;height:100%;text-align:center;}
/* Print
----------------------------------*/
@media print {
body {font-family:Verdana, Arial, sans-serif;font-size: 11px;}
#global {width:auto !important;text-align:left;}
#content {margin:0; padding:0; width:auto; }
table {page-break-inside:avoid}
div.paragraph {page-break-inside:avoid}
div#menu {display:none;}
}

View File

@ -1,4 +1,4 @@
#dialog-password { display:none; }
#dialog { display:none; }
#utilisateur { width:100%; border-collapse:collapse; margin:0;}
#utilisateur tr.titre td { background-color: #D9EEF1; font-weight:bold; }
#utilisateur tr.border td { border:1px dashed #939393; padding:5px; margin:0;}

View File

@ -590,7 +590,7 @@ class Infogreffe
* @return unknown_type
*/
function formatActes($actes)
{
{set_time_limit(90);
$tabActes = array();
//Pour chaque depot
foreach($actes as $key => $depot)