From b0ecfa914965a39c707a59045fa9417164a4fece Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 1 Oct 2013 15:27:46 +0000 Subject: [PATCH] --- .ovhconfig | 6 ++---- .../views/scripts/common/content.phtml | 11 ++++++++++- .../views/scripts/templates/equipe.phtml | 2 ++ images/arrow-accordion-top.svg | 2 +- images/ocsante.png | Bin 0 -> 5754 bytes less/common.less | 17 ++++++++++++++--- less/rightbar.less | 6 ++++++ 7 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 framework/application/views/scripts/templates/equipe.phtml create mode 100644 images/ocsante.png diff --git a/.ovhconfig b/.ovhconfig index e976c42..77f6bef 100644 --- a/.ovhconfig +++ b/.ovhconfig @@ -1,4 +1,2 @@ -app.engine=php -app.engine.version=5.5 -http.firewall=none -environment=development \ No newline at end of file +app.engine=phpcgi +app.engine.version=AUTO \ No newline at end of file diff --git a/framework/application/views/scripts/common/content.phtml b/framework/application/views/scripts/common/content.phtml index 0b653ae..5175c87 100644 --- a/framework/application/views/scripts/common/content.phtml +++ b/framework/application/views/scripts/common/content.phtml @@ -6,9 +6,18 @@ $content = $this->layout()->content . "\n"; if (isset($this->currentPage) && $this->currentPage->getTemplate() == 'home') { $c = $content; } else { + $classmain = ''; + $leftbar = $this->leftbar(); + + if (!$this->showsidebar || !$leftbar) { + $classmain = ' class="noleftbar"'; + } + + + $c = $this->topimage(); - $c.='
'; + $c.='
'; $c.=$this->bcrumbs(); if ($this->showsidebar) { $c.='
'; diff --git a/framework/application/views/scripts/templates/equipe.phtml b/framework/application/views/scripts/templates/equipe.phtml new file mode 100644 index 0000000..a4abe2d --- /dev/null +++ b/framework/application/views/scripts/templates/equipe.phtml @@ -0,0 +1,2 @@ + + width="32px" height="21px" viewBox="0 0 32 21" enable-background="new 0 0 32 21" xml:space="preserve"> diff --git a/images/ocsante.png b/images/ocsante.png new file mode 100644 index 0000000000000000000000000000000000000000..b19bf4148b061391d1562bea44c6498646847e77 GIT binary patch literal 5754 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 literal 0 HcmV?d00001 diff --git a/less/common.less b/less/common.less index 2dbe7b6..a5078ce 100644 --- a/less/common.less +++ b/less/common.less @@ -83,11 +83,11 @@ q:after{content:"";} font-size:14px; line-height:14px; text-align:center; - width:98px; + width:104px; padding:54px 0 0; background-size: 50px 50px; background-position: 50% 0; - margin:0 0 0 11px; + margin:0 0 0 5px; text-decoration: none; } #nav li a[data-name="centre"]{ @@ -313,12 +313,22 @@ q:after{content:"";} padding: 0 0 0 37px; line-height:26px; width: 228px; + +} + +#footer .timing{ + position:relative; + padding: 0 0 96px 0; } #footer .timing .note p{margin:0;} #footer .timing .logos{ margin:0; padding:0; list-style:none; + white-space:nowrap; + position:absolute; + right:0px; + bottom:0px; } #footer .timing .logos li:first-child{margin:22px 0 0;} #footer .timing .logos li{ @@ -363,4 +373,5 @@ q:after{content:"";} background-image: url("../images/arrow-accordion-top.svg"); } } -} \ No newline at end of file +} + diff --git a/less/rightbar.less b/less/rightbar.less index 085ba7f..3b5d21c 100644 --- a/less/rightbar.less +++ b/less/rightbar.less @@ -31,4 +31,10 @@ width:443px; display: inline-block; margin:0 51px 0 0; +} + +.noleftbar #content>div#c{ + width:662px; + display: inline-block; + margin:0 51px 0 0; } \ No newline at end of file -- 2.39.5