Effet de style

This commit is contained in:
Michael RICOIS 2016-02-29 14:37:59 +00:00
parent 3d1c28b534
commit 227668d903
11 changed files with 174 additions and 83 deletions

View File

@ -1,18 +1,7 @@
<!--[if lte IE 6]>
<div class="ui-state-highlight ui-corner-all">
<p><span style="float:left;margin-right:0.3em;" class="ui-icon ui-icon-info"></span>
<strong>Savez-vous que votre version d'Internet Explorer (version 6) est périmée ?</strong>
<br/><span><a style="text-decoration:none;" href="/libs/ie6/index.html" target="_blank">
Pour obtenir la meilleure expérience de navigation possible sur notre site web,
nous vous recommandons de mettre à jour votre navigateur ou d'en choisir un autre,
pour en savoir plus cliquez-ici</a></span>
</p>
</div>
<![endif]-->
<p>&copy; 2006-<?php echo date('Y')?> Scores &amp; D&eacute;cisions SAS -
<?=$this->translate("Tous droits r&eacute;serv&eacute;s")?> -
<a href="http://www.scores-decisions.com/mentions.php" target="_blank">
<?=$this->translate("Mentions l&eacute;gales")?></a> -
<img class='flag' id="fr" src="/themes/default/images/drapeaux/fr.png"/>
<img class='flag' id="en" src="/themes/default/images/drapeaux/en.png"/>
<img class="flag" id="fr" src="/themes/default/images/drapeaux/fr.png"/>
<img class="flag" id="en" src="/themes/default/images/drapeaux/en.png"/>
</p>

View File

@ -1,43 +1,81 @@
<?php if ($this->navigation()->menu()->hasPages()) { ?>
<div id="menu">
<div id="logo">
<img src="/themes/default/images/logos/logo_sd.gif" width="200" height="65" />
<div class="container-fluid">
<div class="navbar-header">
<a class="navbar-brand" href="./">Scores & Décisions</a>
</div>
<?=$this->navigation()->menu();?>
<div class="icones">
<?php if ($this->print) {?>
<a target="_blank" title="Impression" href="/editer/ecran/<?=$this->print.'.html'?>">
<img alt="<?=$this->translate("Impression")?>" src="/themes/default/images/interfaces/printer.png">
</a>
<?php }?>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<?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/default/images/interfaces/pdf.png">
</a>
<?php }?>
<?php if ($this->MenuSaisie !== null) {?>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
Saisie <span class="caret"></span></a>
<ul class="dropdown-menu">
</ul>
</li>
<?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/default/images/interfaces/xml.png">
</a>
<?php }?>
<?php if ($this->print) {?>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
Impression <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a title="Impression" href="/editer/ecran/<?=$this->print.'.html'?>"
target="_blank"><span class="glyphicon glyphicon-print" aria-hidden="true"></span> Ecran</a></li>
<?php if ($this->pdf) {?>
<li><a title="Impression PDF" href="/editer/pdf/<?=$this->pdf.'.pdf'?>"
target="_blank"><span class="fa fa-file-pdf-o" aria-hidden="true"></span> PDF</a></li>
<?php }?>
<?php if ($this->aide) {?>
<a id="aideLigne" title="Aide en ligne" href="#">
<img alt="<?=$this->translate("Activer l'aide en ligne")?>" src="/themes/default/images/interfaces/aideligne.png">
</a>
<?php }?>
<?php if ($this->xml) {?>
<li><a title="Export XML" href="/editer/xml/<?=$this->xml.'.xml'?>" target="_blank">XML</a></li>
<?php }?>
</ul>
</li>
<?php }?>
<?php if ($this->MenuSuivi !== null) {?>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
Suivi <span class="badge"><?=count($this->Suivi)?></span> <span class="caret"></span></a>
<ul class="dropdown-menu">
<?php if (count($this->Suivi) == 0) {?>
<li><a href="#">Aucun suivi</a></li>
<?php } else {?>
<?php foreach ($this->Suivi as $item) {?>
<li><a href="#"><?=$item['label']?></a></li>
<?php }?>
<?php }?>
<li class="divider"></li>
<li><a href="#">Ajouter au portefeuille</a></li>
<li><a href="#">Voir le portefeuille</a></li>
</ul>
</li>
<?php }?>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
Tableau de bord <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="#">Commandes</a></li>
<li><a href="#">Surveillances</a></li>
<li><a href="#">Portefeuille</a></li>
<li role="separator" class="divider"></li>
<li><a href="#">Administration</a></li>
<li><a href="#">Nouveautés</a></li>
<li><a href="#">Paramètres</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
Outils Métier <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="http://ws.scores-decisions.com" target="_blank">WebService</a></li>
<li><a href="<?=$this->url(array('module'=>'default', 'controller'=>'index', 'action'=>'odea'))?>"
target="_blank">ODEA : Données et prospection</a></li>
</ul>
</li>
<li><?=$this->profileLink()?></li>
</ul>
</div>
</div>
<script>
$('div#menu ul.navigation').accordion({
header: '.header',
autoHeight: false,
collapsible: true,
heightStyle: "content",
active: <?=$this->menuId?>
});
</script>
<?php }?>
</div>

View File

@ -7,13 +7,16 @@
<?php echo $this->headScript()?>
</head>
<body>
<div id="global">
<nav class="navbar navbar-default navbar-fixed-top">
<?php echo $this->render('header.phtml')?>
</nav>
<div class="container" id="global">
<?php echo $this->render('menu.phtml')?>
<div id="content">
<?php echo $this->layout()->content?>
<div id="footer">
<?php echo $this->render('footer.phtml')?>
</div>
</div>
</div>
</div>
<?php echo $this->inlineScript()?>

View File

@ -0,0 +1,43 @@
<?php if ($this->navigation()->menu()->hasPages()) { ?>
<div id="menu">
<div id="logo">
<img src="/themes/default/images/logos/logo_sd.gif" width="200" height="65" />
</div>
<?=$this->navigation()->menu();?>
<div class="icones">
<?php if ($this->print) {?>
<a target="_blank" title="Impression" href="/editer/ecran/<?=$this->print.'.html'?>">
<img alt="<?=$this->translate("Impression")?>" src="/themes/default/images/interfaces/printer.png">
</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/default/images/interfaces/pdf.png">
</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/default/images/interfaces/xml.png">
</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/default/images/interfaces/aideligne.png">
</a>
<?php }?>
</div>
</div>
<script>
$('div#menu ul.navigation').accordion({
header: '.header',
autoHeight: false,
collapsible: true,
heightStyle: "content",
active: <?=$this->menuId?>
});
</script>
<?php }?>

View File

@ -0,0 +1,15 @@
<?php
class Zend_View_Helper_ProfileLink extends Zend_View_Helper_Abstract
{
public function profileLink()
{
$auth = Zend_Auth::getInstance();
if ($auth->hasIdentity()) {
$username = $auth->getIdentity()->username;
$logoutUrl = $this->view->url(array('module'=>'default', 'controller'=>'user', 'action'=>'logout'),
'default', true);
return '<a href="'.$logoutUrl.'" title="Se déconnecter" class="navbar-link">Déconnexion : ' . $username . '</a>';
}
}
}

View File

@ -1,6 +1,6 @@
<?=$this->action('new', 'aide')?>
<div id="center-recherche">
<div id="center">
<div id="recherche">
<?php if (!empty($this->message)){ ?>
<div style="padding:0.7em;" class="ui-state-error ui-corner-all">
@ -9,7 +9,7 @@
</div>
<?php }?>
<h3><?=$this->translate("RECHERCHE ENTREPRISE")?></h3>
<h1><?=$this->translate("RECHERCHE ENTREPRISE")?></h1>
<?php $form = $this->form; ?>
<form class="recherche" name="<?php echo $form->getName()?>"
method="<?=$form->getMethod()?>" action="<?=$form->getAction()?>">

View File

@ -1,9 +1,9 @@
<h3 style="color:#ffffff;font-size:medium;font-weight:bold;"><?=$this->translate("RECHERCHE SURVEILLANCE")?></h3>
<form class="recherche" name="refclient" method="post" action="<?=$this->url(array(
'controller'=>'recherche', 'action'=>'refclientliste'), 'default', true)?>">
<h1><?=$this->translate("RECHERCHE SURVEILLANCE")?></h1>
<form class="recherche" name="refclient" method="post" action="<?=$this->url(array('controller'=>'recherche',
'action'=>'refclientliste'), 'default', true)?>">
<input type="hidden" name="type" value="refclient" />
<div class="row">
<label style="font-size:1.1em;padding: 0.4em 5px 0.4em 0;">Référence client</label>
<label>Référence client</label>
<input type="text" name="ref" value="" style="font-size:1.1em;padding: 0.4em 1em;" />
<input class="button" type="submit" name="submit" value="Rechercher" />
</div>

View File

@ -17,22 +17,24 @@ class Application_Controller_Plugin_Menu extends Zend_Controller_Plugin_Abstract
$controller = $request->getControllerName();
$action = $request->getActionName();
//Override SIRET to complete with zero by left
// --- Scroll menu
// Override SIRET to complete with zero by left
$siret = $request->getParam('siret');
if ( intval($siret)>100 ) {
$request->setParam('siret', str_pad($siret, 9, '0', STR_PAD_LEFT));
}
//Génération du menu
// Génération du menu
$computeMenu = new Scores_Menu($request->getParams());
$menu = $computeMenu->getMenu();
$view = $layout->getView();
$view->navigation($menu);
//Génération identifiant Menu
// Génération identifiant Menu
$view->menuId = $computeMenu->getIdMenu($controller, $action);
//Test if the user has the right to access the page
// Test if the user has the right to access the page
$hasPerm = true;
$permPage = $computeMenu->getPagePermission($controller, $action);
if ( !empty($permPage) ) {
@ -51,13 +53,8 @@ class Application_Controller_Plugin_Menu extends Zend_Controller_Plugin_Abstract
}
if ( !$hasPerm ) {
$request->setModuleName('default')
->setControllerName('error')
->setActionName('perms');
$request->setModuleName('default')->setControllerName('error')->setActionName('perms');
} else {
//Gestion affichage Lien Print / PDF / XML
$page = new Scores_Export_Print($controller, $action);

View File

@ -100,8 +100,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'))
<<<<<<< Upstream, based on master
->appendFile('/libs/bootstrap-3.3.6/js/bootstrap.min.js', 'text/javascript')
->appendFile('/libs/jquery/jquery-1.12.3.min.js', 'text/javascript');
=======
->appendFile('/libs/jquery/jquery-1.12.1.min.js', 'text/javascript')
->appendFile('/libs/bootstrap-3.3.6/js/bootstrap.min.js', 'text/javascript');
>>>>>>> 6ae97d6 Effet de style
if ( $UserLogin ) {

View File

@ -11,7 +11,7 @@ $(document).ready(function(){
$(window).scroll(function(e) {
e.stopPropagation();
var offset = $(window).scrollTop();
$("#menu").css('top', offset);
$("#menu").css('top', offset + 70);
});
$('input.button, button, span.ui-button').button();

View File

@ -1,13 +1,17 @@
/* Main
----------------------------------*/
body {background-color:#bebebe;}
#global {width:900px; margin:0 auto; text-align:left;}
#content {float:right;clear:both;width:680px;padding:0;margin:0;padding-top:20px;}
body {
background-color:#eee;
padding-top: 70px;
padding-bottom: 30px;
}
#global {width:970px; margin:0 auto ; text-align:left;}
#content {float:right;clear:both;width:700px;padding:0;margin:0;}
#center {background-color:#fff;padding:5px 0;}
#footer {clear:both;text-align:center;margin-top:15px;}
#footer {background-color:#eee;clear:both;text-align:center;margin:15px 0 0 0;}
#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; }
#center h1 {clear:both;margin:5px;padding:5px;background:#8f8f8f;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:#1A5C7D;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;}
@ -29,7 +33,7 @@ div.ui-state-highlight p {margin: 10px;}
div.ui-state-highlight a {text-decoration: underline;}
.noborder {border:0;}
img {vertical-align:middle;}
.pagination {border:1px solid #CDCDCD;border-radius:3px;width:224px;margin:0 auto;}
.pagination {border:1px solid #cdcdcd;border-radius:3px;width:224px;margin:0 auto;}
.pagination span {
border: medium none;
float: left;
@ -63,13 +67,13 @@ img {vertical-align:middle;}
/* Menu
----------------------------------*/
div#menu {position: absolute;width:200px;}
div#menu {position: absolute;width:220px;}
div#menu .ui-widget {font-family:Arial, Sans-serif;font-size:12px;}
div#menu ul.navigation {padding:0;}
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);}
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:#1A5C7D;}
div#menu ul.navigation li ul {padding:0;overflow:hidden;}
div#menu ul.navigation li ul li a {padding:0 5px;margin:0;background:#eee;border-bottom:1px solid #ddd;text-decoration:none;color:#066;font-weight:normal;}
div#menu ul.navigation li ul li a {padding:0 5px;margin:0;background:#fff;border-bottom:1px solid #ddd;text-decoration:none;color:#1A5C7D;font-weight:normal;}
div#menu ul.navigation li ul li a:hover {background:#066 url(/themes/default/images/menu/linkarrow.gif) no-repeat right center; color: #fff;}
div#menu ul.navigation li ul li a.inactif {color:gray;}
div#menu ul.navigation li a .ui-icon-triangle-1-e {background:url(/themes/default/images/menu/collapsed.gif) no-repeat left center; }
@ -81,14 +85,11 @@ div#menu ul.navigation li a.ui-corner-top {border-top-left-radius: 0;border-top-
div#menu ul.navigation li a.ui-accordion-header {margin-top: 0;}
div#menu ul.navigation li a.ui-state-default,
div#menu ul.navigation li a.ui-state-hover,
div#menu ul.navigation li a.ui-state-active {border: 0;}
div#menu ul.navigation li a.ui-state-active {border:0;border-bottom:1px solid #ddd;}
div#menu div.icones {text-align:center;margin-top:5px;}
/* Recherche
----------------------------------*/
#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;}