Basic design change

This commit is contained in:
Michael RICOIS 2015-06-22 14:55:29 +00:00
parent 1ee1b458bc
commit dfd2abf51a
13 changed files with 138 additions and 158 deletions

View File

@ -56,7 +56,23 @@ class AdminController extends Zend_Controller_Action
/** /**
* Affichage des caractéristiques des services * Affichage des caractéristiques des services
*/ */
public function serviceAction(){} public function serviceAction()
{
$request = $this->getRequest();
$user = new Scores_Utilisateur();
$clientId = $user->getIdClient();
$serviceId = $request->getParam('id');
$ws = new Scores_Ws_Client('gestion', '0.4');
$params = new stdClass();
$params->id = $serviceId;
$response = $ws->getService($params);
if ($response !== false) {
$this->view->Users = $response->item;
}
}
/** /**
* Liste des utilisateurs d'un service * Liste des utilisateurs d'un service
@ -73,7 +89,6 @@ class AdminController extends Zend_Controller_Action
$serviceCode = $request->getParam('service'); $serviceCode = $request->getParam('service');
$ws = new Scores_Ws_Client('gestion', '0.4'); $ws = new Scores_Ws_Client('gestion', '0.4');
//$response = $ws->getUsers(null, $serviceCode, $clientId);
$params = new stdClass(); $params = new stdClass();
$params->actif = null; $params->actif = null;
$params->service = $serviceCode; $params->service = $serviceCode;

View File

@ -1,19 +1,15 @@
<div id="center"> <div class="row"><h1>Administration</h1></div>
<h1>ADMINISTRATION</h1>
<h2>Information client</h2> <div class="row"><h2>Information client</h2></div>
<div class="paragraph">
<p>Nom : <?=$this->Nom?></p> <p>Nom : <?=$this->Nom?></p>
<p>Siret : <?=$this->Siren?> <i><?=$this->Nic?></i></p> <p>Siret : <?=$this->Siren?> <i><?=$this->Nic?></i></p>
<p>Test : <?=$this->Test?></p> <p>Test : <?=$this->Test?></p>
</div>
<h2>Liste des services</h2> <div class="row"><h2>Liste des services</h2></div>
<div class="paragraph">
<p>Les services ou groupes d'utilisateurs sont paramétrés suivant le contrat établi entre votre société et Scores & Decisions. <p>Les services ou groupes d'utilisateurs sont paramétrés suivant le contrat établi entre votre société et Scores & Decisions.
Pour ajouter des services, vous pouvez en faire la demande auprès du support ou de votre commercial.</p> Pour ajouter des services, vous pouvez en faire la demande auprès du support ou de votre commercial.</p>
<?php if (count($this->Services) > 0) {?> <?php if (count($this->Services) > 0) {?>
<table class="data"> <table class="table table-bordered">
<thead> <thead>
<tr> <tr>
<th>Nom</th> <th>Nom</th>
@ -31,14 +27,11 @@ if ($item->Editable == 0){
?> ?>
<tr<?=$trStyle?>> <tr<?=$trStyle?>>
<td><?=$item->Label?></td> <td><?=$item->Label?></td>
<td><a href="<?=$this->url(array('controller'=>'admin', 'action' => 'users', 'service'=>$item->Code), 'default', true)?>">Liste des utilisateurs</a></td> <td><a href="<?=$this->url(array('controller'=>'admin', 'action'=>'users', 'service'=>$item->Code), 'default', true)?>">Liste des utilisateurs</a></td>
<td><a href="#">Paramètrage</a></td> <td><a href="<?=$this->url(array('controller'=>'admin', 'action'=>'service', 'id'=>$item->id), 'default', true)?>">Paramètrage</a></td>
<td><?=$item->Active?></td> <td><?=$item->Active?></td>
</tr> </tr>
<?php }?> <?php }?>
</tbody> </tbody>
</table> </table>
<?php }?> <?php }?>
</div>
</div>

View File

@ -1 +1,6 @@
<?php <div class="row"><h1>Administration</h1></div>
<div class="row"><h2>Service <span style="color:blue;">{nom}</span></h2></div>
<p>- Afficher les caractéristiques principales</p>
<p>- Permission d'accès (afficher toutes les droits diponibles pour faire du commerce)</p>
<p>- Préférences par défaut des utilisateurs</p>

View File

@ -1,28 +1,22 @@
<div id="center"> <div class="row"><h1>Administration</h1></div>
<h1>ADMINISTRATION</h1> <div class="row"><h2>Gestion utilisateur <span style="color:red;"><?=$this->User->Login?></span></h2></div>
<h2>Gestion utilisateur <span style="color:red;"><?=$this->User->Login?></span></h2>
<div class="paragraph">
<h3><?=$this->User->Civilite?>. <?=$this->User->Nom?> <?=$this->User->Prenom?></h3> <h3><?=$this->User->Civilite?>. <?=$this->User->Nom?> <?=$this->User->Prenom?></h3>
</div>
<h2>Identité</h2> <div class="row"><h2>Identité</h2></div>
<div class="paragraph"> <table class="table">
<table class="data">
<tbody> <tbody>
<tr><td>Identifiant :</td><td><?=$this->User->Login?></td></tr> <tr><td>Identifiant</td><td><?=$this->User->Login?></td></tr>
<tr><td>Courriel :</td><td><?=$this->User->Email?></td></tr> <tr><td>Courriel</td><td><?=$this->User->Email?></td></tr>
<tr><td>Actif :</td><td><?=$this->User->Enable?></td></tr> <tr><td>Actif</td><td><?=$this->User->Enable?></td></tr>
</tbody> </tbody>
</table> </table>
</div>
<h2>Service</h2> <div class="row"><h2>Service</h2></div>
<div class="paragraph"> <table class="table">
<table class="data">
<tbody> <tbody>
<tr><td>Nom :</td><td><?=$this->User->ServiceLabel?></td></tr> <tr><td>Nom</td><td><?=$this->User->ServiceLabel?></td></tr>
<tr><td>Adresse IP :</td> <tr><td>Adresse IP</td>
<td> <td>
<?php foreach ($this->User->IP as $ip) {?> <?php foreach ($this->User->IP as $ip) {?>
<?=$ip?></br> <?=$ip?></br>
@ -31,11 +25,9 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
<h2>Accès</h2> <div class="row"><h2>Accès</h2></div>
<div class="paragraph"> <table class="table">
<table class="data">
<tbody> <tbody>
<?php foreach($this->User->Acces->item as $acces) {?> <?php foreach($this->User->Acces->item as $acces) {?>
<tr> <tr>
@ -44,12 +36,5 @@
<?php }?> <?php }?>
</tbody> </tbody>
</table> </table>
</div>
<h2>Préférences</h2> <div class="row"><h2>Préférences</h2></div>
<div class="paragraph">
</div>
</div>

View File

@ -1,15 +1,11 @@
<div id="center"> <div class="row"><h1>Administration</h1></div>
<h1>ADMINISTRATION</h1> <div class="row"><h2>Information Service</h2></div>
<h2>Informations service</h2>
<div class="paragraph">
<p>Afficher les caratéristiques du service</p> <p>Afficher les caratéristiques du service</p>
<p><a href="#">Créer un utilisateur</a></p> <p><a href="#">Créer un utilisateur</a> | Bouton trier</p>
</div>
<h2>Liste des utilisateurs</h2> <div class="row"><h2>Liste des utilisateurs</h2></div>
<div class="paragraph">
<?php if (count($this->Users) > 0) {?> <?php if (count($this->Users) > 0) {?>
<table class="data"> <table class="table table-bordered">
<thead> <thead>
<th>Identifiant</th> <th>Identifiant</th>
<th>Identité</th> <th>Identité</th>
@ -23,8 +19,8 @@
<td><?=$item->Civilite?>. <?=$item->Nom?> <?=$item->Prenom?></td> <td><?=$item->Civilite?>. <?=$item->Nom?> <?=$item->Prenom?></td>
<td><?=$item->Enable?></td> <td><?=$item->Enable?></td>
<td> <td>
<a href="<?=$this->url(array('controller'=> 'admin', 'action'=>'user', 'id'=>$item->id), <a href="<?=$this->url(array('controller'=> 'admin', 'action'=>'user', 'id'=>$item->id), 'default', true)?>">Voir</a>
'default', true)?>">Voir</a> - <a href="<?=$this->url(array('controller'=> 'admin', 'action'=>'user', 'mode'=>'edit', 'id'=>$item->id), - <a href="<?=$this->url(array('controller'=> 'admin', 'action'=>'user', 'mode'=>'edit', 'id'=>$item->id),
'default', true)?>">Editer</a> 'default', true)?>">Editer</a>
</td> </td>
</tr> </tr>
@ -32,5 +28,3 @@
</tbody> </tbody>
</table> </table>
<?php }?> <?php }?>
</div>
</div>

View File

@ -1,8 +1,6 @@
<div id="center"> <div class="row"><h1><?=$this->translate("Nouveautés")?></h1></div>
<h1>Nouveautés</h1>
<h2>Liste par date</h2> <div class="row"><h2>Liste par date</h2></div>
<div class="paragraph">
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
<tr> <tr>
@ -27,6 +25,3 @@
<?php }?> <?php }?>
</tbody> </tbody>
</table> </table>
</div>
</div>

View File

@ -5,15 +5,15 @@
</div> </div>
<div class="col-lg-3 col-md-3"> <div class="col-lg-3 col-md-3">
<?php if ($this->Suivi) {?> <?php if ($this->Suivi !== null) {?>
<div class="btn-group btn-group-sm site-title-buttons"> <div class="btn-group btn-group-sm site-title-buttons">
<button type="button" class="btn btn-info">Suivi</button> <button type="button" class="btn btn-primary">Suivi <span class="badge"><?=count($this->Suivi)?></span></button>
<button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<span class="caret"></span> <span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span> <span class="sr-only">Toggle Dropdown</span>
</button> </button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<?php if (count($this->Suivi)==0) {?> <?php if (count($this->Suivi) == 0) {?>
<li><a href="#">Aucun suivi</a></li> <li><a href="#">Aucun suivi</a></li>
<?php } else {?> <?php } else {?>
<?php foreach ($this->Suivi as $item) {?> <?php foreach ($this->Suivi as $item) {?>
@ -40,9 +40,18 @@
</div> </div>
<div class="col-lg-3 col-md-3 site-title-buttons"> <div class="col-lg-3 col-md-3 site-title-buttons">
<div class="btn-group btn-group-sm" role="group"> <div class="btn-group btn-group-sm" role="group">
<button type="button" class="btn btn-default"><span class="glyphicon glyphicon-print" aria-hidden="true"></span> Imprimer</button> <?php if ($this->print) {?>
<button type="button" class="btn btn-default"><span class="fa fa-file-pdf-o" aria-hidden="true"></span> PDF</button> <a type="button" class="btn btn-default" title="Impression" href="/editer/ecran/<?=$this->print.'.html'?>"
<button type="button" class="btn btn-default">XML</button> 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>
</div> </div>

View File

@ -1,32 +1,19 @@
<?php if ($this->navigation()->menu()->hasPages()) { ?> <?php if ($this->navigation()->menu()->hasPages()) { ?>
<div id="menu" data-spy="affix" data-offset-top="95"> <div id="menu" data-spy="affix" data-offset-top="95">
<?=$this->navigation()->menu();?> <?=$this->navigation()->menu();?>
<div class="btn-group btn-group-sm" role="group">
<div class="icones">
<?php if ($this->print) {?> <?php if ($this->print) {?>
<a target="_blank" title="Impression" href="/editer/ecran/<?=$this->print.'.html'?>"> <a type="button" class="btn btn-default" title="Impression" href="/editer/ecran/<?=$this->print.'.html'?>"
<img alt="<?=$this->translate("Impression")?>" src="/themes/default2015/images/interfaces/printer.png"> target="_blank"><span class="glyphicon glyphicon-print" aria-hidden="true"></span></a>
</a>
<?php }?> <?php }?>
<?php if ($this->pdf) {?> <?php if ($this->pdf) {?>
<a target="_blank" title="Impression PDF" href="/editer/pdf/<?=$this->pdf.'.pdf'?>"> <a type="button" class="btn btn-default" title="Impression PDF" href="/editer/pdf/<?=$this->pdf.'.pdf'?>"
<img alt="<?=$this->translate("Impression en PDF")?>" src="/themes/default2015/images/interfaces/pdf.png"> target="_blank"><span class="fa fa-file-pdf-o" aria-hidden="true"></span></a>
</a>
<?php }?> <?php }?>
<?php if ($this->xml) {?> <?php if ($this->xml) {?>
<a target="_blank" title="Export XML" href="/editer/xml/<?=$this->xml.'.xml'?>"> <a type="button" class="btn btn-default" title="Export XML" href="/editer/xml/<?=$this->xml.'.xml'?>"
<img alt="<?=$this->translate("Export en XML")?>" src="/themes/default2015/images/interfaces/xml.png"> target="_blank">XML</a>
</a>
<?php }?> <?php }?>
<?php if ($this->aide) {?>
<a id="aideLigne" title="Aide en ligne" href="#">
<img alt="<?=$this->translate("Activer l'aide en ligne")?>" src="/themes/default2015/images/interfaces/aideligne.png">
</a>
<?php }?>
</div> </div>
</div> </div>
<script> <script>

View File

@ -1,4 +1,3 @@
<div id="center">
<?php if (!empty($this->message)) { ?> <?php if (!empty($this->message)) { ?>
<div style="margin:5px; padding: 5pt 0.7em;" class="ui-state-highlight ui-corner-all"> <div style="margin:5px; padding: 5pt 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> <p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-info"></span>
@ -6,9 +5,7 @@
</p></div> </p></div>
<?php } ?> <?php } ?>
<h1 class="titre">Paramètres utilisateur</h1> <div class="row"><h1 class="titre">Paramètres utilisateur</h1></div>
<div class="paragraph">
<form id="moncompte" name="moncompte" action="/user" method="post"> <form id="moncompte" name="moncompte" action="/user" method="post">
<input type="hidden" name="login" value="<?=$this->loginVu?>"/> <input type="hidden" name="login" value="<?=$this->loginVu?>"/>
@ -119,18 +116,18 @@
<input type="hidden" name="frmOptions[email]" value="<?=$this->options->email?>"/> <input type="hidden" name="frmOptions[email]" value="<?=$this->options->email?>"/>
<div class="infoTitle StyleInfoLib"> <div class="row">
Num&eacute;ros de t&eacute;l&eacute;phone<br/><i>(Fixe, Fax, Mobile)</i> <div class="col-lg-4 col-md-4"><p class="identite-label">Num&eacute;ros de t&eacute;l&eacute;phone<br/><i>(Fixe, Fax, Mobile)</i></p></div>
</div> <div class="col-lg-8 col-md-8">
<div class="infoData">
<input type="text" size="10" maxlength="15" name="frmOptions[tel_fix]" value="<?=$this->options->tel?>"/> <input type="text" size="10" maxlength="15" name="frmOptions[tel_fix]" value="<?=$this->options->tel?>"/>
<input type="text" size="10" maxlength="15" name="frmOptions[tel_fax]" value="<?=$this->options->fax?>"/> <input type="text" size="10" maxlength="15" name="frmOptions[tel_fax]" value="<?=$this->options->fax?>"/>
<input type="text" size="10" maxlength="15" name="frmOptions[tel_mob]" value="<?=$this->options->mobile?>"/> <input type="text" size="10" maxlength="15" name="frmOptions[tel_mob]" value="<?=$this->options->mobile?>"/>
</div> </div>
<br/> </div>
<div class="infoTitle StyleInfoLib">Mot de passe</div> <div class="row">
<div class="infoData last"> <div class="col-lg-4 col-md-4"><p class="identite-label">Mot de passe</p></div>
<div class="col-lg-8 col-md-8">
<?php <?php
if ($this->action=='new') { if ($this->action=='new') {
$typeChamp = 'password'; $typeChamp = 'password';
@ -140,14 +137,14 @@ if ($this->action=='new') {
$changePassword = 0; $changePassword = 0;
?> ?>
<a href="#" id="password">Modifier le mot de passe.</a> <a href="#" id="password">Modifier le mot de passe.</a>
<?php <?php } ?>
}
?>
<input type="<?=$typeChamp?>" name="frmOptions[password]" value="password"/> <input type="<?=$typeChamp?>" name="frmOptions[password]" value="password"/>
<input type="hidden" name="frmOptions[changepwd]" value="<?php echo $changePassword?>"/> <input type="hidden" name="frmOptions[changepwd]" value="<?php echo $changePassword?>"/>
</div> </div>
</div>
<div class="infoTitle StyleInfoLib">Relevé de consommation</div> <div class="row">
<div class="col-lg-4 col-md-4"><p class="identite-label">Relevé de consommation</p></div>
<?php <?php
//Consomation //Consomation
if ($this->isAdmin || $this->isSuperAdmin){ if ($this->isAdmin || $this->isSuperAdmin){
@ -157,9 +154,11 @@ if ($this->isAdmin || $this->isSuperAdmin){
); );
} }
?> ?>
</div>
<div class="infoTitle StyleInfoLib">Langue de l'interface par défaut</div> <div class="row">
<div class="infoData"> <div class="col-lg-4 col-md-4"><p class="identite-label">Langue de l'interface par défaut</p></div>
<div class="col-lg-8 col-md-8">
<select name="frmOptions[lang]"> <select name="frmOptions[lang]">
<?php <?php
$lngOpts = array('fr' => 'Français', 'en' => 'English'); $lngOpts = array('fr' => 'Français', 'en' => 'English');
@ -174,13 +173,13 @@ foreach($lngOpts as $lngKey => $lngVal)
</div> </div>
</div> </div>
<h2>Informations</h2> <div class="row"><h2>Informations</h2></div>
<div class="paragraph"> <div class="row">
<div class="col-lg-4 col-md-4"><p class="identite-label">Type d'appareil actuel</p></div>
<div class="infoTitle StyleInfoLib">Type d'appareil actuel</div> <div class="col-lg-8 col-md-8">
<div class="infoData">
<?=($this->device_type==0) ? 'Poste de travail': 'Mobile'?> <?=($this->device_type==0) ? 'Poste de travail': 'Mobile'?>
</div> </div>
</div>
<div class="infoTitle StyleInfoLib">Résolution d'écran actuel</div> <div class="infoTitle StyleInfoLib">Résolution d'écran actuel</div>
<div class="infoData"> <div class="infoData">
@ -188,14 +187,11 @@ foreach($lngOpts as $lngKey => $lngVal)
</div> </div>
<div class="infoTitle StyleInfoLib">Navigateur actuel</div> <div class="infoTitle StyleInfoLib">Navigateur actuel</div>
<div class="infoData"><?=$this->browser_info?></div> <div class="col-lg-8 col-md-8"><?=$this->browser_info?></div>
</div>
<h2>Moteur de recherche</h2>
<div class="paragraph">
<div class="row"><h2>Moteur de recherche</h2></div>
<div class="infoTitle StyleInfoLib">R&eacute;sultats par page</div> <div class="infoTitle StyleInfoLib">R&eacute;sultats par page</div>
<div class="infoData"> <div class="col-lg-8 col-md-8">
<select name="frmOptions[nbReponses]"> <select name="frmOptions[nbReponses]">
<?php <?php
$opts = array(10, 20, 30, 40, 50, 100, 150, 200); $opts = array(10, 20, 30, 40, 50, 100, 150, 200);
@ -207,7 +203,6 @@ foreach($opts as $opt)
} }
?> ?>
</select> </select>
</div>
<div class="infoTitle StyleInfoLib">Inclure</div> <div class="infoTitle StyleInfoLib">Inclure</div>
<div class="infoData last"> <div class="infoData last">
@ -219,9 +214,7 @@ foreach($opts as $opt)
</div> </div>
<h2>Surveillance</h2> <div class="row"><h2>Surveillance</h2></div>
<div class="paragraph">
<div class="infoTitle StyleInfoLib">Supports pour les alertes</div> <div class="infoTitle StyleInfoLib">Supports pour les alertes</div>
<div class="infoData last"> <div class="infoData last">
<input type="checkbox" name="frmOptions[alertes][]" value="sms" disabled class="noborder"/> SMS<br/> <input type="checkbox" name="frmOptions[alertes][]" value="sms" disabled class="noborder"/> SMS<br/>
@ -229,11 +222,7 @@ foreach($opts as $opt)
<input type="checkbox" name="frmOptions[alertes][]" value="mail" checked disabled class="noborder"/> Mail<br/> <input type="checkbox" name="frmOptions[alertes][]" value="mail" checked disabled class="noborder"/> Mail<br/>
</div> </div>
</div> <div class="row"><h2>Gestion des droits</h2></div>
<h2>Gestion des droits</h2>
<div class="paragraph">
<div class="infoTitle StyleInfoLib">Type de profil</div> <div class="infoTitle StyleInfoLib">Type de profil</div>
<div class="infoData"> <div class="infoData">
<?php if ($this->isSuperAdmin){ ?> <?php if ($this->isSuperAdmin){ ?>
@ -296,11 +285,8 @@ foreach ($this->prefsLib as $code => $lib) {
<?php }?> <?php }?>
</div> </div>
</div>
<?php if ( $this->options->idClient == 1 && !in_array('edition',$this->droits) ) { ?> <?php if ( $this->options->idClient == 1 && !in_array('edition',$this->droits) ) { ?>
<h2>Mode spéciaux</h2> <div class="row"><h2>Mode spéciaux</h2></div>
<div class="paragraph">
<div class="infoTitle StyleInfoLib">Mode Edition</div> <div class="infoTitle StyleInfoLib">Mode Edition</div>
<div class="infoData last"> <div class="infoData last">
<?php <?php
@ -312,14 +298,11 @@ if ( $this->options->modeEdition==true ) {
<input type="checkbox" name="modeEdition" value="1"<?=$check?> class="noborder"/> <input type="checkbox" name="modeEdition" value="1"<?=$check?> class="noborder"/>
<span id="msgModeEdition"></span> <span id="msgModeEdition"></span>
</div> </div>
</div>
<?php }?> <?php }?>
<div class="submit"><p class="submit-button"><input type="submit" class="button" value="Sauver"/></p></div> <div class="submit"><p class="submit-button"><input type="submit" class="button" value="Sauver"/></p></div>
</form> </form>
</div>
<div id="dialog-password" title="Modifier le mot de passe"> <div id="dialog-password" title="Modifier le mot de passe">
<form> <form>
<label for="npass1">Nouveau mot de passe</label><br/> <label for="npass1">Nouveau mot de passe</label><br/>

View File

@ -26,17 +26,14 @@ $(document).ready(function(){
}); });
}); });
</script> </script>
<div id="center"> <div class="row"><h1>Administration</h1></div>
<h1>ADMINISTRATION</h1>
<h2>Relevé de consommation complet</h2> <div class="row"><h2>Relevé de consommation complet</h2></div>
<div class="paragraph">
<?=$this->action('conso', 'user', null , array('login'=>$this->login, 'idClient'=>$this->idClient));?> <?=$this->action('conso', 'user', null , array('login'=>$this->login, 'idClient'=>$this->idClient));?>
</div>
<h2>Liste des profils utilisateurs</h2> <div class="row"><h2>Liste des profils utilisateurs</h2></div>
<div class="paragraph"> <div class="paragraph">
<table id="utilisateur"> <table id="utilisateur" class="table table-bordered">
<?php if (isset($message) && $message != '') {?> <?php if (isset($message) && $message != '') {?>
<tr> <tr>
<td width="30">&nbsp;</td> <td width="30">&nbsp;</td>
@ -128,4 +125,3 @@ foreach ($this->utilisateurs as $uti) {
</table> </table>
</div> </div>
</div>

View File

@ -146,7 +146,7 @@ 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%;} #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 {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 {font-size:11px;font-family: arial,sans-serif;border:1px solid silver;padding:2px;}
#LiasseTable td.amount-value {min-width:70px;} #LiasseTable td.amount-value {min-width:70px; white-space:nowrap;}
#liasseForm th {color:#606060;font-weight:bold;} #liasseForm th {color:#606060;font-weight:bold;}
#liasseForm {margin-left:30px;} #liasseForm {margin-left:30px;}
#liasseForm td {color:#606060;} #liasseForm td {color:#606060;}

View File

@ -36,8 +36,25 @@ p.bg-classes {
/* Menu /* Menu
-------------------------------------------------- */ -------------------------------------------------- */
@media (max-width: 992px) {
div#menu {
display: none;
}
}
@media (min-width: 992px) {
div#menu {
display:block;
width: 213px;
}
}
@media (min-width: 1200px) {
div#menu {
display:block;
width: 263px;
}
}
.ui-accordion .ui-accordion-content { padding:0; } .ui-accordion .ui-accordion-content { padding:0; }
div#menu.affix { top:10px; width:262px; } div#menu.affix { top:10px; }
div#menu ul.navigation > li a { display:block; text-decoration:none; font-weight:bold; color:#fff; background:#1a5c7d; } div#menu ul.navigation > li a { display:block; text-decoration:none; font-weight:bold; color:#fff; background:#1a5c7d; }
div#menu ul.navigation > li ul { padding:0; overflow:hidden; } div#menu ul.navigation > li ul { padding:0; overflow:hidden; }
div#menu ul.navigation > li ul li .ui-accordion-content { padding:0; } div#menu ul.navigation > li ul li .ui-accordion-content { padding:0; }
@ -78,6 +95,9 @@ div#menu ul.navigation li a.ui-corner-all,
-------------------------------------------------- */ -------------------------------------------------- */
.datemaj span { display:none; } .datemaj span { display:none; }
/* Finance
-------------------------------------------------- */
#LiasseTable td.amount-value {min-width:70px; white-space:nowrap;}
/* Print /* Print
----------------------------------*/ ----------------------------------*/

View File

@ -17,6 +17,7 @@ resources.frontController.plugins.Menu = "Application_Controller_Plugin_Menu"
resources.frontController.plugins.Pdf = "Application_Controller_Plugin_Pdf" resources.frontController.plugins.Pdf = "Application_Controller_Plugin_Pdf"
resources.frontController.plugins.Xml = "Application_Controller_Plugin_Xml" resources.frontController.plugins.Xml = "Application_Controller_Plugin_Xml"
resources.frontController.plugins.Cgu = "Application_Controller_Plugin_Cgu" resources.frontController.plugins.Cgu = "Application_Controller_Plugin_Cgu"
resources.frontController.plugins.Suivi = "Application_Controller_Plugin_Suivi"
resources.frontController.params.displayExceptions = 0 resources.frontController.params.displayExceptions = 0
resources.layout.layout = "layout" resources.layout.layout = "layout"
resources.layout.layoutPath = APPLICATION_PATH "/views/default" resources.layout.layoutPath = APPLICATION_PATH "/views/default"
@ -24,12 +25,9 @@ resources.view.basePath = APPLICATION_PATH "/views/default"
; Scores configuration ; Scores configuration
profil.server.name = development profil.server.name = development
profil.webservice.location = sdsrvdev01
profil.webservice.url = "http://webservice-2.7.sd.lan"; profil.webservice.url = "http://webservice-2.7.sd.lan";
profil.mail.method = smtp profil.mail.method = smtp
profil.mail.smtp_host = smtp.free.fr profil.mail.smtp_host = smtp.free.fr
profil.mail.username = yourusername
profil.mail.password = yourpassword
profil.mail.email.support = supportdev@scores-decisions.com profil.mail.email.support = supportdev@scores-decisions.com
profil.mail.email.supportdev = supportdev@scores-decisions.com profil.mail.email.supportdev = supportdev@scores-decisions.com
profil.mail.email.contact = supportdev@scores-decisions.com profil.mail.email.contact = supportdev@scores-decisions.com
@ -37,12 +35,12 @@ profil.mail.email.production = supportdev@scores-decisions.com
profil.path.cache = APPLICATION_PATH "/../data/cache" profil.path.cache = APPLICATION_PATH "/../data/cache"
profil.path.files = APPLICATION_PATH "/../data/files" profil.path.files = APPLICATION_PATH "/../data/files"
profil.path.pages = APPLICATION_PATH "/../data/pages" profil.path.pages = APPLICATION_PATH "/../data/pages"
profil.path.data = "/your/persistent/path/" profil.path.data = "/home/vhosts/data/extranet/"
profil.wkhtmltopdf.path = "/usr/local/bin/wkhtmltopdf" profil.wkhtmltopdf.path = "/usr/local/bin/wkhtmltopdf"
profil.db.sdv1.adapter=mysqli profil.db.sdv1.adapter=mysqli
profil.db.sdv1.params.host=127.0.0.1 profil.db.sdv1.params.host=127.0.0.1
profil.db.sdv1.params.username=root profil.db.sdv1.params.username=root
profil.db.sdv1.params.password=password profil.db.sdv1.params.password=scores
profil.db.sdv1.params.dbname=extranet profil.db.sdv1.params.dbname=extranet
profil.db.sdv1.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8" profil.db.sdv1.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
@ -52,7 +50,7 @@ phpSettings.soap.wsdl_cache_enabled = 1
[development : production] [development : production]
phpSettings.display_startup_errors = 1 phpSettings.display_startup_errors = 1
phpSettings.display_errors = 1 phpSettings.display_errors = 0
phpSettings.soap.wsdl_cache_enabled = 0 phpSettings.soap.wsdl_cache_enabled = 0
resources.frontController.params.displayExceptions = 1 resources.frontController.params.displayExceptions = 1