(no commit message)

diff --git a/.ovhconfig b/.ovhconfig
index e976c425cc3eafa0651cbe32913978841b42e78a..77f6befb8bd76b3cf2f66b0cca75b2e1e01e4e36 100644 (file)
--- a/.ovhconfig
+++ b/.ovhconfig
@@ -1,4 +1,2 @@
-app.engine=php\r
-app.engine.version=5.5\r
-http.firewall=none\r
-environment=development
\ No newline at end of file
+app.engine=phpcgi\r
+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 0b653aee38de7137417c4f1ad5de46d2d3d6462a..5175c871480120f1599e9c53fa1e7b88b9528217 100644 (file)
--- 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') {\r
        $c = $content;\r
 } else {\r
+       $classmain = '';\r
+\r
        $leftbar = $this->leftbar();\r
+\r
+       if (!$this->showsidebar || !$leftbar) {\r
+               $classmain = ' class="noleftbar"';\r
+       }\r
+\r
+\r
+\r
        $c = $this->topimage();\r
-       $c.='<div id="main">';\r
+       $c.='<div id="main"' . $classmain . '>';\r
        $c.=$this->bcrumbs();\r
        if ($this->showsidebar) {\r
                $c.='<div class="twocolumns">';\r

diff --git a/framework/application/views/scripts/templates/equipe.phtml b/framework/application/views/scripts/templates/equipe.phtml
new file mode 100644 (file)
index 0000000..a4abe2d
--- /dev/null
+++ b/framework/application/views/scripts/templates/equipe.phtml
@@ -0,0 +1,2 @@
+<?php
+

diff --git a/images/arrow-accordion-top.svg b/images/arrow-accordion-top.svg
index 3a951e75170871b4309690abb855d8b28576cb16..01f9e8dbd36e877e1cd920e3df32398422754425 100644 (file)
--- a/images/arrow-accordion-top.svg
+++ b/images/arrow-accordion-top.svg
@@ -2,7 +2,7 @@
 <!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
 <svg version="1.0" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
-        width="17px" height="21px" viewBox="0 0 17 21" enable-background="new 0 0 17 21" xml:space="preserve">\r
+        width="32px" height="21px" viewBox="0 0 32 21" enable-background="new 0 0 32 21" xml:space="preserve">\r
 <g>\r
        <ellipse fill="#696969" cx="8.5" cy="1.105" rx="1.09" ry="1.105"/>\r
        <ellipse fill="#696969" cx="6.03" cy="3.609" rx="1.09" ry="1.105"/>\r

diff --git a/images/ocsante.png b/images/ocsante.png
new file mode 100644 (file)
index 0000000..b19bf41
Binary files /dev/null and b/images/ocsante.png differ

diff --git a/less/common.less b/less/common.less
index 2dbe7b62cbda4aa779db2edc823f7e1a31496e8f..a5078ceb47359f6a6487023639e9c3953d8a7b31 100644 (file)
--- a/less/common.less
+++ b/less/common.less
@@ -83,11 +83,11 @@ q:after{content:"";}
        font-size:14px;\r
        line-height:14px;\r
        text-align:center;\r
-       width:98px;\r
+       width:104px;\r
        padding:54px 0 0;\r
        background-size: 50px 50px;\r
        background-position: 50% 0;\r
-       margin:0 0 0 11px;\r
+       margin:0 0 0 5px;\r
        text-decoration: none;\r
 }\r
 #nav li a[data-name="centre"]{\r
@@ -313,12 +313,22 @@ q:after{content:"";}
        padding: 0 0 0 37px;\r
        line-height:26px;\r
        width: 228px;\r
+       \r
+}\r
+\r
+#footer .timing{\r
+       position:relative;\r
+       padding: 0 0 96px 0;\r
 }\r
 #footer .timing .note p{margin:0;}\r
 #footer .timing .logos{\r
        margin:0;\r
        padding:0;\r
        list-style:none;\r
+       white-space:nowrap;\r
+       position:absolute;\r
+       right:0px;\r
+       bottom:0px;\r
 }\r
 #footer .timing .logos li:first-child{margin:22px 0 0;}\r
 #footer .timing .logos li{\r
@@ -363,4 +373,5 @@ q:after{content:"";}
                        background-image: url("../images/arrow-accordion-top.svg");\r
                }\r
        }\r
-}
\ No newline at end of file
+}\r
+\r

diff --git a/less/rightbar.less b/less/rightbar.less
index 085ba7fd2c487c14b0c8111e51c97cb0a7263003..3b5d21c615b7c980bd1fc4d6b7afd0755f532bda 100644 (file)
--- 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