Theme 2015

This commit is contained in:
Michael RICOIS 2015-07-07 05:24:06 +00:00
parent d9b46a6c88
commit 22571eff7c
15 changed files with 366 additions and 58 deletions

View File

@ -3,10 +3,38 @@
<div id="logo" class="col-lg-3 col-md-3">
<img class="center-block" src="<?=$this->theme->pathImg?>/logos/logo.png" width="200" height="60" />
</div>
<div class="col-lg-3 col-md-3">
<div class="input-group input-group-sm site-title-buttons">
<input type="text" class="form-control" placeholder="Identifiant">
<span class="input-group-btn">
<button class="btn btn-default" type="button">
<span class="glyphicon glyphicon-search" aria-hidden="true"></span>
</button>
</span>
</div>
</div>
<div class="col-lg-6 col-md-6 site-title-buttons">
<div class="btn-group btn-group-sm" role="group">
<?php if ($this->print) {?>
<a type="button" class="btn btn-default" title="Impression" href="/editer/ecran/<?=$this->print.'.html'?>"
target="_blank"><span class="glyphicon glyphicon-print" aria-hidden="true"></span> Imprimer</a>
<?php }?>
<?php if ($this->pdf) {?>
<a type="button" class="btn btn-default" title="Impression PDF" href="/editer/pdf/<?=$this->pdf.'.pdf'?>"
target="_blank"><span class="fa fa-file-pdf-o" aria-hidden="true"></span> PDF</a>
<?php }?>
<?php if ($this->xml) {?>
<a type="button" class="btn btn-default" title="Export XML" href="/editer/xml/<?=$this->xml.'.xml'?>"
target="_blank">XML</a>
<?php }?>
<?php if ($this->Suivi !== null) {?>
<div class="btn-group btn-group-sm site-title-buttons">
<div class="btn-group btn-group-sm">
<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>
@ -25,34 +53,9 @@
<li><a href="#">Voir le portefeuille</a></li>
</ul>
</div>
<?php }?>
</div>
<div class="col-lg-3 col-md-3">
<div class="input-group input-group-sm site-title-buttons">
<input type="text" class="form-control" placeholder="Identifiant">
<span class="input-group-btn">
<button class="btn btn-default" type="button">
<span class="glyphicon glyphicon-search" aria-hidden="true"></span>
</button>
</span>
</div>
</div>
<div class="col-lg-3 col-md-3 site-title-buttons">
<div class="btn-group btn-group-sm" role="group">
<?php if ($this->print) {?>
<a type="button" class="btn btn-default" title="Impression" href="/editer/ecran/<?=$this->print.'.html'?>"
target="_blank"><span class="glyphicon glyphicon-print" aria-hidden="true"></span> Imprimer</a>
<?php }?>
<?php if ($this->pdf) {?>
<a type="button" class="btn btn-default" title="Impression PDF" href="/editer/pdf/<?=$this->pdf.'.pdf'?>"
target="_blank"><span class="fa fa-file-pdf-o" aria-hidden="true"></span> PDF</a>
<?php }?>
<?php if ($this->xml) {?>
<a type="button" class="btn btn-default" title="Export XML" href="/editer/xml/<?=$this->xml.'.xml'?>"
target="_blank">XML</a>
<?php }?>
</div>
</div>
</div>
</div>

View File

@ -2,11 +2,11 @@
<div class="row">
<div class="col-lg-4 col-md-4"><p class="identite-label">Num&eacute;ro identifiant Siren</p></div>
<div class="col-lg-8 col-md-8"<p><?=$this->SirenTexte($this->siren)?></p></div>
<div class="col-lg-8 col-md-8"><p><?=$this->SirenTexte($this->siren)?></p></div>
</div>
<div class="row">
<div class="col-lg-4 col-md-4"><p class="identite-label">Dénomination Sociale</p></div>
<div class="col-lg-8 col-md-8"<p><?=$this->raisonSociale?></p></div>
<div class="col-lg-8 col-md-8"><p><?=$this->raisonSociale?></p></div>
</div>
<div class="row"><h2>&Eacute;v&eacute;nements INSEE</h2></div>
@ -71,6 +71,19 @@ Liste des événements uniquement sur l'établissement <?=$this->Nic?>.
<?php }?>
</table>
<div class="row">
<div class="center-block text-center col-lg-12 col-md-12 col-sm-12 col-xs-12">
<ul class="pagination">
<li><a href="#" aria-label="Previous"><span aria-hidden="true">&laquo;</span></a></li>
<li><a href="#" aria-label="Previous"><span aria-hidden="true">&lsaquo;</span></a></li>
<li><a href="#">Page 1/5</a></li>
<li><a href="#" aria-label="Next"><span aria-hidden="true">&rsaquo;</span></a></li>
<li><a href="#" aria-label="Next"><span aria-hidden="true">&raquo;</span></a></li>
</ul>
</div>
</div>
<?php if ( $this->PageTotal>1 ) {?>
<div class="paragraph">
<div class="pagination clearfix">

View File

@ -1,9 +1,6 @@
<?php if ( $this->texte ) {?>
<div class="row">
<div class="col-lg-4 col-md-4">
<p class="identite-label"><?=$this->label?></p>
</div>
<div class="col-lg-4 col-md-4"><p class="identite-label"><?=$this->label?></p></div>
<?php
if (!empty($this->titre)) {
$titre = ' title="'.$this->titre.'"';
@ -11,8 +8,6 @@
$titre = '';
}
?>
<div class="col-lg-8 col-md-8"<?=$titre?>>
<p><?=$this->texte?></p>
</div>
<div class="col-lg-8 col-md-8"<?=$titre?>><?=$this->texte?></div>
</div>
<?php } ?>

View File

@ -31,12 +31,12 @@ echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Isin']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Capitalisation']);
echo $this->partial('identite/fiche-item.phtml', $this->logo);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['NumRC']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Groupe']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['AutreId']);
//echo $this->partial('identite/fiche-item.phtml', $this->dBlock['NumRM']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Actif']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['SituationJuridique']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['SituationInsee']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['SituationRncs']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Situation']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['AutreSiren']);
?>
@ -46,6 +46,7 @@ echo $this->partial('identite/fiche-item.phtml', $this->dBlock['AutreSiren']);
<?php
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['RaisonSociale']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Nom2']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['NomCommercial']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['EnseigneSigle']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['FormeJuridique']);
@ -53,6 +54,9 @@ echo $this->partial('identite/fiche-item.phtml', $this->dBlock['DateImmat']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['DateCreaEn']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['DateCreaEt']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Adresse']);
if ( empty($this->AutrePage) ) {
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['RNVP']);
}
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Zones']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Tel']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Fax']);
@ -62,8 +66,6 @@ echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Mail']);
<div class="row"><h2><?=$this->translate("Activité(s) &amp; Chiffre d'affaires")?></h2></div>
<?php
//Remplace Siren pour texte
//$this->dBlock['ActiviteEn']['texte'] = $this->RemplaceSiren($this->dBlock['ActiviteEn']['texte']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['ActiviteEn']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['ActiviteEt']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Naf4']);

View File

@ -18,7 +18,6 @@ Filiales, détention minimum
<input id="filter" type="button" value="Filtrer" style="float:right;">
</div>
<div>
<div>
<input id="text" type="text" value="">
<input id="search" type="button" value="Rechercher">
<input id="clear_search" type="button" value="Initialiser">

View File

@ -1,6 +1,10 @@
<?php if ($this->navigation()->menu()->hasPages()) { ?>
<div id="menu" data-spy="affix" data-offset-top="95">
<?=$this->navigation()->menu();?>
<div class="row">
<div class="center-block text-center">
<div class="btn-group btn-group-sm" role="group">
<?php if ($this->print) {?>
<a type="button" class="btn btn-default" title="Impression" href="/editer/ecran/<?=$this->print.'.html'?>"
@ -15,6 +19,9 @@
target="_blank">XML</a>
<?php }?>
</div>
</div>
</div>
</div>
<script>
$('div#menu ul.navigation').accordion({

View File

@ -0,0 +1,46 @@
<div id="center">
<h1>Commandes de Statuts Association</h1>
<div class="paragraph">
<form action="<?=$this->url(array('controller'=>'order', 'action'=>'assostatut'), null, true)?>">
<select name="y" >
<?php foreach($this->Years as $year) { ?>
<option value="<?=$year?>" <?php if($year==$this->year) echo 'selected';?>><?=$year?></option>
<?php } ?>
</select>
<select name="m">
<?php foreach($this->Months as $month) { ?>
<option value="<?=$month?>" <?php if($month==$this->month) echo 'selected';?>><?=$month?></option>
<?php } ?>
</select>
<input type="submit" value="OK" />
</form>
</div>
<h2>Liste des commandes</h2>
<div class="paragraph">
<?php if (count($this->Cmd) > 0) {?>
<table class="data">
<thead>
<tr>
<th>Reference</th>
<th>Société</th>
<th>Date</th>
<th>Detail</th>
</tr>
</thead>
<tbody>
<?php foreach($this->Cmd as $item) {?>
<tr>
<td><?=$item->Reference?></td>
<td><?=$item->CompanyName?> <?php if (!empty($item->CompanySiren)) {?>(<?=$item->CompanySiren?>)<?php }?></td>
<td style="white-space: nowrap;"><?=$item->DateInsert?></td>
<td></td>
</tr>
<?php }?>
</tbody>
</table>
<?php }?>
</div>
</div>

View File

@ -0,0 +1,51 @@
<div id="center">
<h1>Commandes de saisie de bilan</h1>
<div class="paragraph">
<form action="<?=$this->url(array('controller'=>'order', 'action'=>'bilaninput'), null, true)?>">
<select name="y" >
<?php foreach($this->Years as $year) { ?>
<option value="<?=$year?>" <?php if($year==$this->year) echo 'selected';?>><?=$year?></option>
<?php } ?>
</select>
<select name="m">
<?php foreach($this->Months as $month) { ?>
<option value="<?=$month?>" <?php if($month==$this->month) echo 'selected';?>><?=$month?></option>
<?php } ?>
</select>
<input type="submit" value="OK" />
</form>
</div>
<h2>Liste des commandes</h2>
<div class="paragraph">
<?php if (count($this->Cmd) > 0) {?>
<table class="data">
<thead>
<tr>
<th>Reference</th>
<th>Siren</th>
<th>Bilan</th>
<th>Date</th>
<th>Saisi le</th>
<th>Detail</th>
</tr>
</thead>
<tbody>
<?php foreach($this->Cmd as $item) {?>
<tr>
<td><?=$item->Reference?></td>
<td><?=$item->Siren?></td>
<td><?=$item->BilanType?> - <?=$item->BilanCloture?></td>
<td><?=$item->DateInsert?></td>
<td><?=$item->DateSaisie?></td>
<td></td>
</tr>
<?php }?>
</tbody>
</table>
<?php }?>
</div>
</div>

View File

@ -0,0 +1,48 @@
<div id="center">
<h1>Commandes de pièces officielles - actes</h1>
<div class="paragraph">
<form action="<?=$this->url(array('controller'=>'order', 'action'=>'greffeacte'), null, true)?>">
<select name="y" >
<?php foreach($this->Years as $year) { ?>
<option value="<?=$year?>" <?php if($year==$this->year) echo 'selected';?>><?=$year?></option>
<?php } ?>
</select>
<select name="m">
<?php foreach($this->Months as $month) { ?>
<option value="<?=$month?>" <?php if($month==$this->month) echo 'selected';?>><?=$month?></option>
<?php } ?>
</select>
<input type="submit" value="OK" />
</form>
</div>
<h2>Liste des commandes</h2>
<div class="paragraph">
<?php if (count($this->Cmd) > 0) {?>
<table class="data">
<thead>
<tr>
<th>Reference</th>
<th>Société</th>
<th>Document</th>
<th>Date</th>
<th>Detail</th>
</tr>
</thead>
<tbody>
<?php foreach($this->Cmd as $item) {?>
<tr>
<td><?=$item->Reference?></td>
<td><?=$item->CompanyName?> <?php if (!empty($item->CompanySiren)) {?>(<?=$item->CompanySiren?>)<?php }?></td>
<td><?=$item->DocLabel?></td>
<td><?=$item->DateInsert?></td>
<td></td>
</tr>
<?php }?>
</tbody>
</table>
<?php }?>
</div>
</div>

View File

@ -0,0 +1,48 @@
<div id="center">
<h1>Commandes de pièces officielles - bilans au format image</h1>
<div class="paragraph">
<form action="<?=$this->url(array('controller'=>'order', 'action'=>'greffebilan'), null, true)?>">
<select name="y" >
<?php foreach($this->Years as $year) { ?>
<option value="<?=$year?>" <?php if($year==$this->year) echo 'selected';?>><?=$year?></option>
<?php } ?>
</select>
<select name="m">
<?php foreach($this->Months as $month) { ?>
<option value="<?=$month?>" <?php if($month==$this->month) echo 'selected';?>><?=$month?></option>
<?php } ?>
</select>
<input type="submit" value="OK" />
</form>
</div>
<h2>Liste des commandes</h2>
<div class="paragraph">
<?php if (count($this->Cmd) > 0) {?>
<table class="data">
<thead>
<tr>
<th>Reference</th>
<th>Société</th>
<th>Bilan</th>
<th>Date</th>
<th>Detail</th>
</tr>
</thead>
<tbody>
<?php foreach($this->Cmd as $item) {?>
<tr>
<td><?=$item->Reference?></td>
<td><?=$item->CompanyName?> <?php if (!empty($item->CompanySiren)) {?>(<?=$item->CompanySiren?>)<?php }?></td>
<td><?=$item->DocBilanType?> - <?=$item->DocBilanCloture?></td>
<td><?=$item->DateInsert?></td>
<td></td>
</tr>
<?php }?>
</tbody>
</table>
<?php }?>
</div>
</div>

View File

@ -0,0 +1,26 @@
<div class="row"><h1>Commandes</h1></div>
<p>
<a href="<?=$this->url(array('controller'=>'order', 'action'=>'kbis'), 'default', true)?>">KBIS</a>
<br/>Liste des commandes KBIS.
</p>
<p>
<a href="<?=$this->url(array('controller'=>'order', 'action'=>'greffebilan'), 'default', true)?>">Pièces officielles - Bilans</a>
</br>Liste des commandes de bilan au format image.
</p>
<p>
<a href="<?=$this->url(array('controller'=>'order', 'action'=>'greffeacte'), 'default', true)?>">Pièces officielles - Actes</a>
</br>Liste des commandes d'actes et statuts
</p>
<p>
<a href="<?=$this->url(array('controller'=>'order', 'action'=>'assostatut'), 'default', true)?>">Statuts associations</a>
</br>Liste des commandes de statuts associations
</p>
<p>
<a href="<?=$this->url(array('controller'=>'order', 'action'=>'bilaninput'), 'default', true)?>">Saisie de bilan</a>
</br>Liste des commandes de saisie de bilan
</p>

View File

@ -0,0 +1,53 @@
<div id="center">
<h1>Commandes KBIS</h1>
<div class="paragraph">
<form action="<?=$this->url(array('controller'=>'order', 'action'=>'kbis'), null, true)?>">
<select name="y" >
<?php foreach($this->Years as $year) { ?>
<option value="<?=$year?>" <?php if($year==$this->year) echo 'selected';?>><?=$year?></option>
<?php } ?>
</select>
<select name="m">
<?php foreach($this->Months as $month) { ?>
<option value="<?=$month?>" <?php if($month==$this->month) echo 'selected';?>><?=$month?></option>
<?php } ?>
</select>
<input type="submit" value="OK" />
</form>
</div>
<h2>Liste des commandes</h2>
<div class="paragraph">
<?php if (count($this->Cmd) > 0) {?>
<table class="data">
<thead>
<tr>
<th>Reference</th>
<th>Société</th>
<th>Mode</th>
<th>Date</th>
<th>Detail</th>
</tr>
</thead>
<tbody>
<?php foreach($this->Cmd as $item) {?>
<tr>
<td><?=$item->Reference?></td>
<td><?=$item->CompanyName?> <?php if (!empty($item->CompanySiren)) {?>(<?=$item->CompanySiren?>)<?php }?></td>
<td>
<?php switch($item->Mode) {
case 'T':?> Téléchargement <?php break;
case 'M':?> Courriel <?php break;
}?>
</td>
<td style="white-space: nowrap;"><?=$item->DateInsert?></td>
<td></td>
</tr>
<?php }?>
</tbody>
</table>
<?php }?>
</div>
</div>

View File

@ -4,7 +4,7 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
public function preDispatch(Zend_Controller_Request_Abstract $request)
{
//Specify default theme
$theme = 'default2015'; //$theme = 'mobile';
$theme = 'default2015';
$auth = Zend_Auth::getInstance();
if ( $auth->hasIdentity() ) {
@ -20,7 +20,7 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
//Get useragent and device informations
$userAgent = $bootstrap->getResource('useragent');
$device = $userAgent->getDevice();
//Sauvegarde des paramètres du themes pour gérer les scripts et styles à utiliser
$paramsTheme = new stdClass();
$paramsTheme->name = $theme;
@ -28,11 +28,11 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
$paramsTheme->pathScript = '/themes/'.$theme.'/scripts';
$paramsTheme->pathImg = '/themes/'.$theme.'/images';
Zend_Registry::set('theme', $paramsTheme);
//Module default de l'application
$layoutPath = APPLICATION_PATH . '/views/' . $theme;
$viewPath = APPLICATION_PATH . '/views/' . $theme;
//Override path for view and layout
$view = $bootstrap->bootstrap('View')->getResource('View');
$view->setBasePath($viewPath);
@ -46,18 +46,18 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
if ( $controller == 'user' && ( $action == 'login' || $action == 'logout' ) ) {
$UserLogin = true;
}
if ( $controller == 'auth' ) {
$UserLogin = true;
}
// --- IE6 Detection
$isIE6 = false;
if ( $device->getFeature('browser_name')=='Internet Explorer'
&& $device->getFeature('browser_version')=='6.0' ) {
$isIE6 = true;
}
// --- Load default style and javascript files for the selected theme
switch ( $theme )
{
@ -89,7 +89,7 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
'type' => 'image/x-icon',
'href' => '/favicon.ico')
);
/**
* ===> Standard Styles
*/
@ -110,14 +110,10 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
$view->headLink()
->appendStylesheet('/libs/ui-1.10.4/themes/smoothness/jquery-ui.min.css', 'all');
}
<<<<<<< .working
$view->headLink()->appendStylesheet('/libs/qtip/jquery.qtip.min.css', 'all');
=======
$view->headLink()
->appendStylesheet('/libs/qtip/jquery.qtip.min.css', 'all')
->appendStylesheet('/libs/font-awesome-4.3.0/css/font-awesome.min.css', 'all');
>>>>>>> .merge-right.r7252
/**
* ===> Standard Javascript
*/
@ -149,7 +145,7 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
->appendFile('/libs/qtip/jquery.qtip.min.js', 'text/javascript')
->appendFile($paramsTheme->pathScript.'/script.js', 'text/javascript');
}
/**
* ===> Specific Style and Script by Controller/Action
* Specialized Controller - Action javascript
@ -274,13 +270,13 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
$view->headScript()
->appendFile('/libs/html5shiv.min.js', 'text/javascript', array('conditional' => 'lt IE 9'))
->appendFile('/libs/respond.min.js', 'text/javascript', array('conditional' => 'lt IE 9'))
->appendFile('/libs/jquery/jquery-1.11.2.min.js', 'text/javascript')
->appendFile('/libs/jquery/jquery-1.11.3.min.js', 'text/javascript')
->appendFile('/libs/bootstrap-3.3.4/js/bootstrap.min.js', 'text/javascript')
->appendFile('/libs/ui-1.11.3/jquery-ui.min.js', 'text/javascript')
->appendFile('/libs/ui-1.11.3/i18n/datepicker-fr.js', 'text/javascript')
->appendFile('/libs/qtip/jquery.qtip.min.js', 'text/javascript');
if ( $UserLogin ) {
} else {
$view->headScript()
->appendFile($paramsTheme->pathScript.'/script.js', 'text/javascript');

View File

@ -62,7 +62,6 @@ $(document).ready(function()
$(this).load(url);
},
buttons: {
Valider: function() { formEnvoiBilanSubmit(); },
Annuler: function() { $(this).dialog('close'); }
},
close: function() { $('#dialogbilanclient').remove(); }

View File

@ -28,3 +28,25 @@ if ($('a.AncienSiege').length){
});
$('a.AncienSiege').attr('title', "Cliquez pour consulter les informations d'activité.");
}
//Tooltip RNVP
if ($('a.rnvp').length){
$('a.rnvp').qtip({
hide: { event: "click" },
content: {
title: {button: true, text: $('a.rnvp').attr('title')},
text: function(event,api) {
$.ajax({ url: $(this).data('href') })
.done(function(html) {
api.set('content.text', html)
})
.fail(function(xhr, status, error) {
api.set('content.text', status + ': ' + error)
})
return 'Chargement...';
}
},
style: { width: 350, classes: "ui-tooltip-cream" },
position: { my: "bottom center", at: "top center" }
});
}