Formattage

This commit is contained in:
Michael RICOIS 2015-01-13 13:35:48 +00:00
parent 4e3f3b6a52
commit f9d26de37e
3 changed files with 19 additions and 11 deletions

View File

@ -1,4 +1,4 @@
<div class="col-sm-3"> <!-- required for floating --> <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3"> <!-- required for floating -->
<!-- Nav tabs --> <!-- Nav tabs -->
<ul class="nav nav-tabs tabs-left"><!-- 'tabs-right' for right tabs --> <ul class="nav nav-tabs tabs-left"><!-- 'tabs-right' for right tabs -->
<li class="active"><a href="#tabs-1" data-toggle="tab">Critères Entreprise</a></li> <li class="active"><a href="#tabs-1" data-toggle="tab">Critères Entreprise</a></li>
@ -9,7 +9,7 @@
</ul> </ul>
</div> </div>
<div class="col-sm-9"> <div class="col-xs-9 col-sm-9 col-md-9 col-lg-9">
<!-- Tab panes --> <!-- Tab panes -->
<div class="tab-content"> <div class="tab-content">
@ -23,7 +23,7 @@
</div> </div>
</div> </div>
<div class="tab-pane active" id="tabs-2"> <div class="tab-pane" id="tabs-2">
<div id="economique"> <div id="economique">
<?php if ( count($this->FieldsEconomique)>0 ) {?> <?php if ( count($this->FieldsEconomique)>0 ) {?>
<?php foreach ( $this->FieldsEconomique as $key => $params ) {?> <?php foreach ( $this->FieldsEconomique as $key => $params ) {?>
@ -33,7 +33,7 @@
</div> </div>
</div> </div>
<div class="tab-pane active" id="tabs-3"> <div class="tab-pane" id="tabs-3">
<div id="geographique"> <div id="geographique">
<?php if ( count($this->FieldsGeographique)>0 ) {?> <?php if ( count($this->FieldsGeographique)>0 ) {?>
<?php foreach ( $this->FieldsGeographique as $key => $params ) {?> <?php foreach ( $this->FieldsGeographique as $key => $params ) {?>
@ -43,7 +43,7 @@
</div> </div>
</div> </div>
<div class="tab-pane active" id="tabs-4"> <div class="tab-pane" id="tabs-4">
<div id="juridique"> <div id="juridique">
<?php if ( count($this->FieldsJuridique)>0 ) {?> <?php if ( count($this->FieldsJuridique)>0 ) {?>
<?php foreach ( $this->FieldsJuridique as $key => $params ) {?> <?php foreach ( $this->FieldsJuridique as $key => $params ) {?>
@ -53,7 +53,7 @@
</div> </div>
</div> </div>
<div class="tab-pane active" id="tabs-5"> <div class="tab-pane" id="tabs-5">
<div id="financiere"> <div id="financiere">
<?php if ( count($this->FieldsFinancier)>0 ) {?> <?php if ( count($this->FieldsFinancier)>0 ) {?>
<?php foreach ( $this->FieldsFinancier as $key => $params ) {?> <?php foreach ( $this->FieldsFinancier as $key => $params ) {?>

View File

@ -1,3 +1,5 @@
<div class="sidebar">
<p class="alert alert-info" id="comptage"> <p class="alert alert-info" id="comptage">
<span class="valeur">Unités : <?=$this->dataCount?></span> <span class="valeur">Unités : <?=$this->dataCount?></span>
<?php if ( $this->dataInsee > 0 ) {?> <?php if ( $this->dataInsee > 0 ) {?>
@ -32,4 +34,6 @@
<a href="/comptage/reset" id="reset" class="btn btn-primary btn-block">Initialiser les critères</a> <a href="/comptage/reset" id="reset" class="btn btn-primary btn-block">Initialiser les critères</a>
<a href="/comptage/previsualisation" id="preview" class="btn btn-primary btn-block">Prévisualiser</a> <a href="/comptage/previsualisation" id="preview" class="btn btn-primary btn-block">Prévisualiser</a>
<a href="/comptage/savedialog" id="extract" class="saveciblage btn btn-primary btn-block">Extraire</a> <a href="/comptage/savedialog" id="extract" class="saveciblage btn btn-primary btn-block">Extraire</a>
</div>
</div> </div>

View File

@ -9,11 +9,15 @@
<?php } else {?> <?php } else {?>
<div class="container col-lg-12"> <div class="container col-lg-12">
<div id="actionMessage"></div> <div id="actionMessage"></div>
<div class="row"> <div class="row">
<div id="tabs" class="col-sm-8 col-md-8 col-lg-8"><?=$this->action('index', 'fields')?></div> <div id="tabs" class="col-sm-8 col-md-8 col-lg-8">
<div id="panel" class="col-sm-4 col-md-4 col-lg-4"><?=$this->action('criteres', 'index')?></div> <?=$this->action('index', 'fields')?>
</div> </div>
<div id="panel" class="col-sm-4 col-md-4 col-lg-4">
<?=$this->action('criteres', 'index')?>
</div>
</div>
</div> </div>
<?php }?> <?php }?>