This commit is contained in:
Michael RICOIS 2016-03-03 10:02:03 +00:00
parent 1dec9d5b20
commit cfa0c26de1
6 changed files with 109 additions and 38 deletions

View File

@ -1,7 +1,10 @@
<p>&copy; 2006-<?php echo date('Y')?> Scores &amp; D&eacute;cisions SAS -
<div class="container">
<p class="text-muted credit">
&copy; 2006-<?php echo date('Y')?> <a href="http://www.scores-decisions.com">Scores &amp; Décisions SAS</a> -
<?=$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"/>
</p>
</div>

View File

@ -1,6 +1,7 @@
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<a class="navbar-brand sd-txtblue" href="./">Scores & Décisions</a>
<a class="navbar-brand" href="<?=$this->url(array('controller'=>'index', 'action'=>'index'), 'default', true)?>">Scores & Décisions</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
@ -91,3 +92,4 @@
</ul>
</div>
</div>
</nav>

View File

@ -7,18 +7,24 @@
<?php echo $this->headScript()?>
</head>
<body>
<nav class="navbar navbar-default navbar-fixed-top">
<div id="wrap">
<?php echo $this->render('header.phtml')?>
</nav>
<?php if ($this->LayoutFluid) {?>
<div class="container-fluid">
<?php echo $this->layout()->content?>
</div>
<?php } else {?>
<div class="container" id="global">
<?php echo $this->render('menu.phtml')?>
<div id="content">
<?php echo $this->layout()->content?>
</div>
</div>
<?php }?>
</div>
<div id="footer">
<?php echo $this->render('footer.phtml')?>
<?php echo $this->render('footer.phtml'); ?>
</div>
</div>
</div>
<?php echo $this->inlineScript()?>
<?php echo $this->inlineScript(); ?>
</body>
</html>

View File

@ -33,7 +33,7 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
//Module default de l'application
$layoutPath = APPLICATION_PATH . '/layouts/' . $theme;
$helperPath = APPLICATION_PATH . '/layouts/helpers';
$viewPath = APPLICATION_PATH . '/modules/'.$module.'/views/' . $theme;
$viewPath = APPLICATION_PATH . '/modules/'.$module.'/views/default';
//Override path for view and layout
$view = $bootstrap->bootstrap('View')->getResource('View');
@ -43,9 +43,15 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
$layout->setLayout('layout');
$layout->setLayoutPath($layoutPath);
$view->LayoutFluid = false;
if ($module == 'default' && in_array($controller, array('user'))) {
$view->LayoutFluid = true;
}
//Load default style and javascript files for the selected theme
switch ( $theme ) {
case 'default':
case 'default2016':
default:
$view->doctype('HTML5');

View File

@ -34,17 +34,18 @@ $(document).ready(function()
});
});
$('a.sTip').qtip({
$('a.sTip').each(function(){
$(this).qtip({
position: { at: 'right center', my: 'right center', adjust: { x: -20 } },
show: { solo: true },
style: { width: 420, classes: 'qtip-light' },
content: {
text: "Chargement...",
title: { text: "Evolution - " + $(this).data('title') },
content: { text: "coucou" }
/*ajax: { url: $(this).data('url') }*/
ajax: { url: $(this).data('url') },
}
});
});
$('#bilanClient').on('click', function(e){
e.preventDefault();

View File

@ -1,18 +1,71 @@
/* Sticky footer styles
-------------------------------------------------- */
html,
body {
height: 100%;
/* The html and body elements cannot have any padding or margin. */
}
/* Wrapper for page content to push down footer */
#wrap {
min-height: 100%;
height: auto !important;
height: 100%;
/* Negative indent footer by its height */
margin: 0 auto -40px;
/* Pad bottom by footer height */
padding: 0 0 40px;
}
/* Set the fixed height of the footer here */
#footer {
height: 40px;
background-color: #f5f5f5;
}
/* Custom page CSS
-------------------------------------------------- */
/* Not required for template or sticky footer method. */
body { font-size:12px; }
.container .credit {
margin: 12px 0;
}
#footer > .container {
padding-left: 15px;
padding-right: 15px;
}
code {
font-size: 80%;
}
p.bg-classes {
padding:15px;
}
#wrap .breadcrumb {
margin-bottom: 0px;
}
/* Main
----------------------------------*/
body {
background-color:#eee;
padding-top: 70px;
padding-bottom: 30px;
/*padding-bottom: 30px;*/
}
#global {width:970px; margin:0 auto ; text-align:left;}
#content {float:right;clear:both;width:700px;padding:0;margin:0;}
#global {width:970px; margin:0 auto 5px; text-align:left;}
#content {float:right;width:700px;}
#center {background-color:#fff;padding:5px 0;}
#footer {background-color:#eee;clear:both;text-align:center;margin:15px 0 0 0;}
#footer p {font:0.9em Arial, Helvetica, sans-serif; }
/*#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:#8f8f8f;color:#ffffff;font-weight:bold;font-size:1.4em;}
#center h2 {clear:both; margin:5px; padding:5px;background:#1A5C7D;color:#ffffff;font-weight:bold;font-size:1.2em;}
div.paragraph {margin:5px;padding:5px;}
div.paragraph {padding:5px;}
/*
a:link {color: #9c093a; text-decoration:none;}
a:visited {color:#0000CC; text-decoration:none;}