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
*/
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
@ -73,7 +89,6 @@ class AdminController extends Zend_Controller_Action
$serviceCode = $request->getParam('service');
$ws = new Scores_Ws_Client('gestion', '0.4');
//$response = $ws->getUsers(null, $serviceCode, $clientId);
$params = new stdClass();
$params->actif = null;
$params->service = $serviceCode;

View File

@ -1,19 +1,15 @@
<div id="center">
<h1>ADMINISTRATION</h1>
<div class="row"><h1>Administration</h1></div>
<h2>Information client</h2>
<div class="paragraph">
<div class="row"><h2>Information client</h2></div>
<p>Nom : <?=$this->Nom?></p>
<p>Siret : <?=$this->Siren?> <i><?=$this->Nic?></i></p>
<p>Test : <?=$this->Test?></p>
</div>
<h2>Liste des services</h2>
<div class="paragraph">
<div class="row"><h2>Liste des services</h2></div>
<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>
<?php if (count($this->Services) > 0) {?>
<table class="data">
<table class="table table-bordered">
<thead>
<tr>
<th>Nom</th>
@ -31,14 +27,11 @@ if ($item->Editable == 0){
?>
<tr<?=$trStyle?>>
<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="#">Paramètrage</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="<?=$this->url(array('controller'=>'admin', 'action'=>'service', 'id'=>$item->id), 'default', true)?>">Paramètrage</a></td>
<td><?=$item->Active?></td>
</tr>
<?php }?>
</tbody>
</table>
<?php }?>
</div>
</div>
<?php }?>

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

View File

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

View File

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

View File

@ -5,15 +5,15 @@
</div>
<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">
<button type="button" class="btn btn-info">Suivi</button>
<button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<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>
</button>
<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>
<?php } else {?>
<?php foreach ($this->Suivi as $item) {?>
@ -40,9 +40,18 @@
</div>
<div class="col-lg-3 col-md-3 site-title-buttons">
<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>
<button type="button" class="btn btn-default"><span class="fa fa-file-pdf-o" aria-hidden="true"></span> PDF</button>
<button type="button" class="btn btn-default">XML</button>
<?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>

View File

@ -1,32 +1,19 @@
<?php if ($this->navigation()->menu()->hasPages()) { ?>
<div id="menu" data-spy="affix" data-offset-top="95">
<?=$this->navigation()->menu();?>
<div class="icones">
<div class="btn-group btn-group-sm" role="group">
<?php if ($this->print) {?>
<a target="_blank" title="Impression" href="/editer/ecran/<?=$this->print.'.html'?>">
<img alt="<?=$this->translate("Impression")?>" src="/themes/default2015/images/interfaces/printer.png">
</a>
<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></a>
<?php }?>
<?php if ($this->pdf) {?>
<a target="_blank" title="Impression PDF" href="/editer/pdf/<?=$this->pdf.'.pdf'?>">
<img alt="<?=$this->translate("Impression en PDF")?>" src="/themes/default2015/images/interfaces/pdf.png">
</a>
<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></a>
<?php }?>
<?php if ($this->xml) {?>
<a target="_blank" title="Export XML" href="/editer/xml/<?=$this->xml.'.xml'?>">
<img alt="<?=$this->translate("Export en XML")?>" src="/themes/default2015/images/interfaces/xml.png">
</a>
<a type="button" class="btn btn-default" title="Export XML" href="/editer/xml/<?=$this->xml.'.xml'?>"
target="_blank">XML</a>
<?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>
<script>

View File

@ -1,4 +1,3 @@
<div id="center">
<?php if (!empty($this->message)) { ?>
<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>
@ -6,9 +5,7 @@
</p></div>
<?php } ?>
<h1 class="titre">Paramètres utilisateur</h1>
<div class="paragraph">
<div class="row"><h1 class="titre">Paramètres utilisateur</h1></div>
<form id="moncompte" name="moncompte" action="/user" method="post">
<input type="hidden" name="login" value="<?=$this->loginVu?>"/>
@ -64,7 +61,7 @@
'controller' => 'user', 'action' => 'emailsecondary',
'idClient' => $this->options->idClient,
'login' => $this->loginVu,
))?>">Voir ou associer des e-mails secondaires</button>
<script>
$('button#user-emails').button({ icons: { primary: "ui-icon-pencil" }, text: false}).click(function(e) {
@ -88,7 +85,7 @@
};
$('<div id="dialog"></div>').dialog(dialogOpts);
return false;
});
$('button#user-emailsecondary').button({icons: { primary: "ui-icon-plusthick" }, text: false}).click(function(e) {
e.preventDefault();
@ -111,7 +108,7 @@
};
$('<div id="dialog"></div>').dialog(dialogOpts);
return false;
});
</script>
</div>
@ -119,18 +116,18 @@
<input type="hidden" name="frmOptions[email]" value="<?=$this->options->email?>"/>
<div class="infoTitle StyleInfoLib">
Num&eacute;ros de t&eacute;l&eacute;phone<br/><i>(Fixe, Fax, Mobile)</i>
</div>
<div class="infoData">
<div class="row">
<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 class="col-lg-8 col-md-8">
<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_mob]" value="<?=$this->options->mobile?>"/>
</div>
<br/>
</div>
<div class="infoTitle StyleInfoLib">Mot de passe</div>
<div class="infoData last">
<div class="row">
<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
if ($this->action=='new') {
$typeChamp = 'password';
@ -140,14 +137,14 @@ if ($this->action=='new') {
$changePassword = 0;
?>
<a href="#" id="password">Modifier le mot de passe.</a>
<?php
}
?>
<?php } ?>
<input type="<?=$typeChamp?>" name="frmOptions[password]" value="password"/>
<input type="hidden" name="frmOptions[changepwd]" value="<?php echo $changePassword?>"/>
</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
//Consomation
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="infoData">
<div class="row">
<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]">
<?php
$lngOpts = array('fr' => 'Français', 'en' => 'English');
@ -174,13 +173,13 @@ foreach($lngOpts as $lngKey => $lngVal)
</div>
</div>
<h2>Informations</h2>
<div class="paragraph">
<div class="infoTitle StyleInfoLib">Type d'appareil actuel</div>
<div class="infoData">
<div class="row"><h2>Informations</h2></div>
<div class="row">
<div class="col-lg-4 col-md-4"><p class="identite-label">Type d'appareil actuel</p></div>
<div class="col-lg-8 col-md-8">
<?=($this->device_type==0) ? 'Poste de travail': 'Mobile'?>
</div>
</div>
<div class="infoTitle StyleInfoLib">Résolution d'écran actuel</div>
<div class="infoData">
@ -188,14 +187,11 @@ foreach($lngOpts as $lngKey => $lngVal)
</div>
<div class="infoTitle StyleInfoLib">Navigateur actuel</div>
<div class="infoData"><?=$this->browser_info?></div>
</div>
<h2>Moteur de recherche</h2>
<div class="paragraph">
<div class="col-lg-8 col-md-8"><?=$this->browser_info?></div>
<div class="row"><h2>Moteur de recherche</h2></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]">
<?php
$opts = array(10, 20, 30, 40, 50, 100, 150, 200);
@ -207,7 +203,6 @@ foreach($opts as $opt)
}
?>
</select>
</div>
<div class="infoTitle StyleInfoLib">Inclure</div>
<div class="infoData last">
@ -219,9 +214,7 @@ foreach($opts as $opt)
</div>
<h2>Surveillance</h2>
<div class="paragraph">
<div class="row"><h2>Surveillance</h2></div>
<div class="infoTitle StyleInfoLib">Supports pour les alertes</div>
<div class="infoData last">
<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/>
</div>
</div>
<h2>Gestion des droits</h2>
<div class="paragraph">
<div class="row"><h2>Gestion des droits</h2></div>
<div class="infoTitle StyleInfoLib">Type de profil</div>
<div class="infoData">
<?php if ($this->isSuperAdmin){ ?>
@ -296,11 +285,8 @@ foreach ($this->prefsLib as $code => $lib) {
<?php }?>
</div>
</div>
<?php if ( $this->options->idClient == 1 && !in_array('edition',$this->droits) ) { ?>
<h2>Mode spéciaux</h2>
<div class="paragraph">
<div class="row"><h2>Mode spéciaux</h2></div>
<div class="infoTitle StyleInfoLib">Mode Edition</div>
<div class="infoData last">
<?php
@ -312,14 +298,11 @@ if ( $this->options->modeEdition==true ) {
<input type="checkbox" name="modeEdition" value="1"<?=$check?> class="noborder"/>
<span id="msgModeEdition"></span>
</div>
</div>
<?php }?>
<div class="submit"><p class="submit-button"><input type="submit" class="button" value="Sauver"/></p></div>
</form>
</div>
<div id="dialog-password" title="Modifier le mot de passe">
<form>
<label for="npass1">Nouveau mot de passe</label><br/>

View File

@ -26,17 +26,14 @@ $(document).ready(function(){
});
});
</script>
<div id="center">
<h1>ADMINISTRATION</h1>
<div class="row"><h1>Administration</h1></div>
<h2>Relevé de consommation complet</h2>
<div class="paragraph">
<div class="row"><h2>Relevé de consommation complet</h2></div>
<?=$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">
<table id="utilisateur">
<table id="utilisateur" class="table table-bordered">
<?php if (isset($message) && $message != '') {?>
<tr>
<td width="30">&nbsp;</td>
@ -127,5 +124,4 @@ foreach ($this->utilisateurs as $uti) {
</tr>
</table>
</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%;}
#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;}
#LiasseTable td.amount-value {min-width:70px; white-space:nowrap;}
#liasseForm th {color:#606060;font-weight:bold;}
#liasseForm {margin-left:30px;}
#liasseForm td {color:#606060;}

View File

@ -36,8 +36,25 @@ p.bg-classes {
/* 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; }
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 ul { padding:0; overflow:hidden; }
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; }
/* Finance
-------------------------------------------------- */
#LiasseTable td.amount-value {min-width:70px; white-space:nowrap;}
/* 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.Xml = "Application_Controller_Plugin_Xml"
resources.frontController.plugins.Cgu = "Application_Controller_Plugin_Cgu"
resources.frontController.plugins.Suivi = "Application_Controller_Plugin_Suivi"
resources.frontController.params.displayExceptions = 0
resources.layout.layout = "layout"
resources.layout.layoutPath = APPLICATION_PATH "/views/default"
@ -24,12 +25,9 @@ resources.view.basePath = APPLICATION_PATH "/views/default"
; Scores configuration
profil.server.name = development
profil.webservice.location = sdsrvdev01
profil.webservice.url = "http://webservice-2.7.sd.lan";
profil.mail.method = smtp
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.supportdev = 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.files = APPLICATION_PATH "/../data/files"
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.db.sdv1.adapter=mysqli
profil.db.sdv1.params.host=127.0.0.1
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.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
@ -52,7 +50,7 @@ phpSettings.soap.wsdl_cache_enabled = 1
[development : production]
phpSettings.display_startup_errors = 1
phpSettings.display_errors = 1
phpSettings.display_errors = 0
phpSettings.soap.wsdl_cache_enabled = 0
resources.frontController.params.displayExceptions = 1